diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 15:10:46 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 15:10:46 +0200 |
| commit | 21af6c4f2aa5f63138871b4ddd77d7ebf2588c9d (patch) | |
| tree | 5f10080f93bc6460ef87886a906498cec332b1a6 /kernel/auditsc.c | |
| parent | AUDIT: Stop waiting for backlog after audit_panic() happens (diff) | |
| download | linux-21af6c4f2aa5f63138871b4ddd77d7ebf2588c9d.tar.xz linux-21af6c4f2aa5f63138871b4ddd77d7ebf2588c9d.zip | |
AUDIT: Really don't audit auditd.
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>
Diffstat (limited to 'kernel/auditsc.c')
| -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 34a990223c9e..0fdd90194ecc 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -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(); @@ -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) |