summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2013-12-10 22:10:41 -0500
committerEric Paris <eparis@redhat.com>2014-03-20 10:11:55 -0400
commitc92cdeb45eea38515e82187f48c2e4f435fb4e25 (patch)
treef3eedc38f7e5b6012d053e6c05ad2df3975f4c08
parentad36d28293936b03d6b7996e9d6aadfd73c0eb08 (diff)
downloadop-kernel-dev-c92cdeb45eea38515e82187f48c2e4f435fb4e25.zip
op-kernel-dev-c92cdeb45eea38515e82187f48c2e4f435fb4e25.tar.gz
audit: convert PPIDs to the inital PID namespace.
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: stable@vger.kernel.org Cc: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
-rw-r--r--kernel/audit.c4
-rw-r--r--kernel/auditsc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 7b44bd4..e1e1b21 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1819,10 +1819,10 @@ void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk)
spin_unlock_irq(&tsk->sighand->siglock);
audit_log_format(ab,
- " ppid=%ld pid=%d auid=%u uid=%u gid=%u"
+ " ppid=%d pid=%d auid=%u uid=%u gid=%u"
" euid=%u suid=%u fsuid=%u"
" egid=%u sgid=%u fsgid=%u tty=%s ses=%u",
- sys_getppid(),
+ task_ppid_nr(tsk),
tsk->pid,
from_kuid(&init_user_ns, audit_get_loginuid(tsk)),
from_kuid(&init_user_ns, cred->uid),
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 57bf178..a6cf7ab 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -465,7 +465,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;
OpenPOWER on IntegriCloud