diff options
| author | Richard Guy Briggs <rgb@redhat.com> | 2013-12-10 22:10:41 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-29 11:38:07 +0200 |
| commit | 1eff16e242de6916cdd365655c61b315fa752cc1 (patch) | |
| tree | dd36ce00341fa35cf95fb3284c9d014271522f6e | |
| parent | 146ca9148a6898ebc57576419dd375ac266f23b2 (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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | kernel/audit.c | 4 | ||||
| -rw-r--r-- | kernel/auditsc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 74ced93e570..50512d11a44 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1613,10 +1613,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 9845cb32b60..3b79a47ddb1 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -472,7 +472,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; |