diff options
author | Paul Moore <pmoore@redhat.com> | 2014-12-19 18:35:53 -0500 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2014-12-19 18:35:53 -0500 |
commit | 3640dcfa4fd00cd91d88bb86250bdb496f7070c0 (patch) | |
tree | de75adc9ca42230ba0f8aeb4255c3f120acb51d8 /kernel | |
parent | 0f7e94ee40d06f7a04e039392dfee8244bd8a7e0 (diff) |
audit: don't attempt to lookup PIDs when changing PID filtering audit rules
Commit f1dc4867 ("audit: anchor all pid references in the initial pid
namespace") introduced a find_vpid() call when adding/removing audit
rules with PID/PPID filters; unfortunately this is problematic as
find_vpid() only works if there is a task with the associated PID
alive on the system. The following commands demonstrate a simple
reproducer.
# auditctl -D
# auditctl -l
# autrace /bin/true
# auditctl -l
This patch resolves the problem by simply using the PID provided by
the user without any additional validation, e.g. no calls to check to
see if the task/PID exists.
Cc: stable@vger.kernel.org # 3.15
Cc: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Acked-by: Eric Paris <eparis@redhat.com>
Reviewed-by: Richard Guy Briggs <rgb@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/auditfilter.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index d214cd073a58..c0d148bd7a5c 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c | |||
@@ -444,19 +444,6 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, | |||
444 | f->val = 0; | 444 | f->val = 0; |
445 | } | 445 | } |
446 | 446 | ||
447 | if ((f->type == AUDIT_PID) || (f->type == AUDIT_PPID)) { | ||
448 | struct pid *pid; | ||
449 | rcu_read_lock(); | ||
450 | pid = find_vpid(f->val); | ||
451 | if (!pid) { | ||
452 | rcu_read_unlock(); | ||
453 | err = -ESRCH; | ||
454 | goto exit_free; | ||
455 | } | ||
456 | f->val = pid_nr(pid); | ||
457 | rcu_read_unlock(); | ||
458 | } | ||
459 | |||
460 | err = audit_field_valid(entry, f); | 447 | err = audit_field_valid(entry, f); |
461 | if (err) | 448 | if (err) |
462 | goto exit_free; | 449 | goto exit_free; |