---

yaml --- r: 286058 b: refs/heads/master c: 7ff68e5 h: refs/heads/master v: v3
git-mirror · Jan 17, 2012 · d5ac427 · d5ac427
1 parent 769c94e
commit d5ac427
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4ff8dba7d8ce5ceb43fb27df66292251cc73bdc
+refs/heads/master: 7ff68e53ece8c175d2951bb8a30b3cce8f9c5579
diff --git a/trunk/kernel/auditfilter.c b/trunk/kernel/auditfilter.c
@@ -235,13 +235,15 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
 	switch(listnr) {
 	default:
 		goto exit_err;
-	case AUDIT_FILTER_USER:
-	case AUDIT_FILTER_TYPE:
 #ifdef CONFIG_AUDITSYSCALL
 	case AUDIT_FILTER_ENTRY:
+		if (rule->action == AUDIT_ALWAYS)
+			goto exit_err;
 	case AUDIT_FILTER_EXIT:
 	case AUDIT_FILTER_TASK:
 #endif
+	case AUDIT_FILTER_USER:
+	case AUDIT_FILTER_TYPE:
 		;
 	}
 	if (unlikely(rule->action == AUDIT_POSSIBLE)) {