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

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

[Tony Jones]

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);
 

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

[Andrew Morton]

> 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?

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

[S.Çağlar Onur]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

23 Haz 2007 Cts tarihinde, Andrew Morton şunları yazmıştı: 
> This looks like 2.6.22 material to me.
>
> Question is: is it also 2.6.21.x material?

I even can reproduce same oops with 2.6.18 :)

Cheers
-- 
S.Çağlar Onur <caglar@pardus.org.tr>
http://cekirdek.pardus.org.tr/~caglar/

Linux is like living in a teepee. No Windows, no Gates and an Apache in house!

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

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

[Al Viro]

On Sat, Jun 23, 2007 at 09:51:53AM -0700, Andrew Morton wrote:
> This looks like 2.6.22 material to me.
> 
> Question is: is it also 2.6.21.x material?

Yes, it is.

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

[Andrew Morton]

On Sat, 23 Jun 2007 20:16:09 +0100 Al Viro <viro@ftp.linux.org.uk> wrote:

> On Sat, Jun 23, 2007 at 09:51:53AM -0700, Andrew Morton wrote:
> > This looks like 2.6.22 material to me.
> > 
> > Question is: is it also 2.6.21.x material?
> 
> Yes, it is.

OK, thanks, I queued it for both kernels.