diff options
author | Richard Guy Briggs <rgb@redhat.com> | 2013-12-10 22:10:41 -0500 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-30 16:23:23 +0100 |
commit | 135db4db00fec7f7680f3d104c887aad6b4e465f (patch) | |
tree | 5a6888f4c22f1b10cb07c9aca46e7764ee8ed344 | |
parent | 0ce844aea64b8bff202676fd87f2932b3eb35b83 (diff) |
audit: convert PPIDs to the inital PID namespace.
commit c92cdeb45eea38515e82187f48c2e4f435fb4e25 upstream.
sys_getppid() returns the parent pid of the current process in its own pid
namespace. Since audit filters are based in the init pid namespace, a process
could avoid a filter or trigger an unintended one by being in an alternate pid
namespace or log meaningless information.
Switch to task_ppid_nr() for PPIDs to anchor all audit filters in the
init_pid_ns.
(informed by ebiederman's 6c621b7e)
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
[bwh: Backported to 3.2: sys_getppid() is used by audit_exit() but not
audit_log_task_info()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | kernel/auditsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 47b7fc1ea89..aeac7cccd5e 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -473,7 +473,7 @@ static int audit_filter_rules(struct task_struct *tsk, case AUDIT_PPID: if (ctx) { if (!ctx->ppid) - ctx->ppid = sys_getppid(); + ctx->ppid = task_ppid_nr(tsk); result = audit_comparator(ctx->ppid, f->op, f->val); } break; @@ -1335,7 +1335,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts /* tsk == current */ context->pid = tsk->pid; if (!context->ppid) - context->ppid = sys_getppid(); + context->ppid = task_ppid_nr(tsk); cred = current_cred(); context->uid = cred->uid; context->gid = cred->gid; |