The patch titled
audit: fix oops removing watch if audit disabled
has been added to the -mm tree. Its filename is
audit-fix-oops-removing-watch-if-audit-disabled.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: audit: fix oops removing watch if audit disabled
From: Tony Jones <tonyj@xxxxxxx>
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@xxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/auditfilter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/auditfilter.c~audit-fix-oops-removing-watch-if-audit-disabled kernel/auditfilter.c
--- a/kernel/auditfilter.c~audit-fix-oops-removing-watch-if-audit-disabled
+++ a/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);
_
Patches currently in -mm which might be from tonyj@xxxxxxx are
audit-fix-oops-removing-watch-if-audit-disabled.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
