Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linux pidhashtable plugin pointer verification improvements #1260

Merged
merged 1 commit into from
Sep 15, 2024
Merged

Linux pidhashtable plugin pointer verification improvements #1260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions volatility3/framework/plugins/linux/pidhashtable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PIDHashTable(plugins.PluginInterface):

_required_framework_version = (2, 0, 0)

_version = (1, 0, 0)
_version = (1, 0, 1)

@classmethod
def get_requirements(cls) -> List[interfaces.configuration.RequirementInterface]:
Expand All @@ -45,9 +45,7 @@ def get_requirements(cls) -> List[interfaces.configuration.RequirementInterface]
]

def _is_valid_task(self, task) -> bool:
vmlinux = self.context.modules[self.config["kernel"]]
vmlinux_layer = self.context.layers[vmlinux.layer_name]
return bool(task and task.pid > 0 and vmlinux_layer.is_valid(task.parent))
return bool(task and task.pid > 0 and task.parent.is_readable())

def _get_pidtype_pid(self):
vmlinux = self.context.modules[self.config["kernel"]]
Expand Down Expand Up @@ -96,7 +94,7 @@ def _walk_upid(self, seen_upids, upid):
seen_upids.add(upid.vol.offset)

pid_chain = upid.pid_chain
if not (pid_chain and vmlinux_layer.is_valid(pid_chain.vol.offset)):
if not (pid_chain.next and pid_chain.next.is_readable()):
break

upid = linux.LinuxUtilities.container_of(
Expand All @@ -105,7 +103,6 @@ def _walk_upid(self, seen_upids, upid):

def _get_upids(self):
vmlinux = self.context.modules[self.config["kernel"]]
vmlinux_layer = self.context.layers[vmlinux.layer_name]

# 2.6.24 <= kernels < 4.15
pidhash = self._get_pidhash_array()
Expand All @@ -115,7 +112,7 @@ def _get_upids(self):
# each entry in the hlist is a upid which is wrapped in a pid
ent = hlist.first

while ent and vmlinux_layer.is_valid(ent.vol.offset):
while ent and ent.is_readable():
# upid->pid_chain exists 2.6.24 <= kernel < 4.15
upid = linux.LinuxUtilities.container_of(
ent.vol.offset, "upid", "pid_chain", vmlinux
Expand Down Expand Up @@ -143,7 +140,7 @@ def _pid_hash_implementation(self):
continue

pid_tasks_0 = pid.tasks[pidtype_pid].first
if not pid_tasks_0:
if not (pid_tasks_0 and pid_tasks_0.is_readable()):
continue

task = vmlinux.object(
Expand All @@ -160,7 +157,7 @@ def _task_for_radix_pid_node(self, nodep):
pidtype_pid = self._get_pidtype_pid()

pid_tasks_0 = pid.tasks[pidtype_pid].first
if not pid_tasks_0:
if not (pid_tasks_0 and pid_tasks_0.is_readable()):
return None

task_struct_type = vmlinux.get_type("task_struct")
Expand Down
Loading