Re: [PATCH 1/1] audit: fix oops removing watch if audit disabled

Andrew Morton
2007-06-23T16:52:32Z

> On Wed, 20 Jun 2007 15:38:20 -0700 Tony Jones <tonyj@suse.de> wrote:
> Removing a watched file will oops if audit is disabled (auditctl -e 0).
>
> To reproduce:
> - auditctl -e 1
> - touch /tmp/foo
> - auditctl -w /tmp/foo
> - auditctl -e 0
> - rm /tmp/foo (or mv)
>
> Signed-off-by: Tony Jones <tonyj@suse.de>
> ---
>
> diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
> index 74cc0fc..ce61f42 100644
> --- a/kernel/auditfilter.c
> +++ b/kernel/auditfilter.c
> @@ -947,7 +947,7 @@ static void audit_update_watch(struct au
>
> /* If the update involves invalidating rules, do the inode-based
> * filtering now, so we don't omit records. */
> - if (invalidating &&
> + if (invalidating && current->audit_context &&
> audit_filter_inodes(current, current->audit_context) == AUDIT_RECORD_CONTEXT)
> audit_set_auditable(current->audit_context);

This looks like 2.6.22 material to me.

Question is: is it also 2.6.21.x material?