[PATCH] Fix audit record filtering with !CONFIG_AUDITSYSCALL

This fixes the per-user and per-message-type filtering when syscall
auditing isn't enabled.

[AV: folded followup fix from the same author]

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 70 insertions, 0 deletions

diff --git a/kernel/audit.h b/kernel/audit.h
new file mode 100644
index 000000000000..7643e46daeb2
--- /dev/null
+++ b/kernel/audit.h
@@ -0,0 +1,70 @@
+/* audit -- definition of audit_context structure and supporting types 
+ *
+ * Copyright 2003-2004 Red Hat, Inc.
+ * Copyright 2005 Hewlett-Packard Development Company, L.P.
+ * Copyright 2005 IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/fs.h>
+#include <linux/audit.h>
+
+/* 0 = no checking
+   1 = put_count checking
+   2 = verbose put_count checking
+*/
+#define AUDIT_DEBUG 0
+
+/* At task start time, the audit_state is set in the audit_context using
+   a per-task filter.  At syscall entry, the audit_state is augmented by
+   the syscall filter. */
+enum audit_state {
+        AUDIT_DISABLED,         /* Do not create per-task audit_context.
+                                 * No syscall-specific audit records can
+                                 * be generated. */
+        AUDIT_SETUP_CONTEXT,    /* Create the per-task audit_context,
+                                 * but don't necessarily fill it in at
+                                 * syscall entry time (i.e., filter
+                                 * instead). */
+        AUDIT_BUILD_CONTEXT,    /* Create the per-task audit_context,
+                                 * and always fill it in at syscall
+                                 * entry time.  This makes a full
+                                 * syscall record available if some
+                                 * other part of the kernel decides it
+                                 * should be recorded. */
+        AUDIT_RECORD_CONTEXT    /* Create the per-task audit_context,
+                                 * always fill it in at syscall entry
+                                 * time, and always write out the audit
+                                 * record at syscall exit time.  */
+};
+
+/* Rule lists */
+struct audit_entry {
+        struct list_head  list;
+        struct rcu_head   rcu;
+        struct audit_rule rule;
+};
+
+
+extern int audit_pid;
+extern int audit_comparator(const u32 left, const u32 op, const u32 right);
+
+extern void                 audit_send_reply(int pid, int seq, int type,
+                                             int done, int multi,
+                                             void *payload, int size);
+extern void                 audit_log_lost(const char *message);
+extern void                 audit_panic(const char *message);
+extern struct semaphore audit_netlink_sem;