Skip to content

Commit

Permalink
AUDIT: Really don't audit auditd.
Browse files Browse the repository at this point in the history
The pid in the audit context isn't always set up. Use tsk->pid when 
checking whether it's auditd in audit_filter_syscall(), instead of 
ctx->pid. Remove a band-aid which did the same elsewhere.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
David Woodhouse committed Jul 2, 2005
1 parent ac4cec4 commit 21af6c4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/auditsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk,
int word = AUDIT_WORD(ctx->major);
int bit = AUDIT_BIT(ctx->major);

if (audit_pid && ctx->pid == audit_pid)
if (audit_pid && tsk->pid == audit_pid)
return AUDIT_DISABLED;

rcu_read_lock();
Expand Down Expand Up @@ -601,7 +601,7 @@ static inline struct audit_context *audit_get_context(struct task_struct *tsk,
context->return_valid = return_valid;
context->return_code = return_code;

if (context->in_syscall && !context->auditable && tsk->pid != audit_pid) {
if (context->in_syscall && !context->auditable) {
enum audit_state state;
state = audit_filter_syscall(tsk, context, &audit_filter_list[AUDIT_FILTER_EXIT]);
if (state == AUDIT_RECORD_CONTEXT)
Expand Down

0 comments on commit 21af6c4

Please sign in to comment.