3 files changed, 82 insertions, 16 deletions

diff --git a/include/asm-ppc/seccomp.h b/include/asm-ppc/seccomp.h
new file mode 100644
index 000000000000..666c4da96d87
--- /dev/null
+++ b/include/asm-ppc/seccomp.h
@@ -0,0 +1,10 @@
+#ifndef _ASM_SECCOMP_H
+
+#include <linux/unistd.h>
+
+#define __NR_seccomp_read __NR_read
+#define __NR_seccomp_write __NR_write
+#define __NR_seccomp_exit __NR_exit
+#define __NR_seccomp_sigreturn __NR_rt_sigreturn
+
+#endif /* _ASM_SECCOMP_H */
diff --git a/include/asm-ppc/thread_info.h b/include/asm-ppc/thread_info.h
index f7f01524e8a8..e3b5284a6f91 100644
--- a/include/asm-ppc/thread_info.h
+++ b/include/asm-ppc/thread_info.h
@@ -77,12 +77,19 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling
                                            TIF_NEED_RESCHED */
 #define TIF_MEMDIE              5
+#define TIF_SYSCALL_AUDIT       6       /* syscall auditing active */
+#define TIF_SECCOMP             7      /* secure computing */
+
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
+#define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
+#define _TIF_SECCOMP            (1<<TIF_SECCOMP)
+
+#define _TIF_SYSCALL_T_OR_A     (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP)
 
 /*
  * Non racy (local) flags bit numbers
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 19f04b049798..51e5879af7fc 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -27,15 +27,55 @@
 #include <linux/sched.h>
 #include <linux/elf.h>
 
-/* Request and reply types */
-#define AUDIT_GET      1000     /* Get status */
-#define AUDIT_SET      1001     /* Set status (enable/disable/auditd) */
-#define AUDIT_LIST     1002     /* List filtering rules */
-#define AUDIT_ADD      1003     /* Add filtering rule */
-#define AUDIT_DEL      1004     /* Delete filtering rule */
-#define AUDIT_USER     1005     /* Send a message from user-space */
-#define AUDIT_LOGIN    1006     /* Define the login id and informaiton */
-#define AUDIT_KERNEL   2000     /* Asynchronous audit record. NOT A REQUEST. */
+/* The netlink messages for the audit system is divided into blocks:
+ * 1000 - 1099 are for commanding the audit system
+ * 1100 - 1199 user space trusted application messages
+ * 1200 - 1299 messages internal to the audit daemon
+ * 1300 - 1399 audit event messages
+ * 1400 - 1499 SE Linux use
+ * 1500 - 1999 future use
+ * 2000 is for otherwise unclassified kernel audit messages
+ *
+ * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user
+ * space. Anything over that is kernel --> user space communication.
+ */
+#define AUDIT_GET               1000    /* Get status */
+#define AUDIT_SET               1001    /* Set status (enable/disable/auditd) */
+#define AUDIT_LIST              1002    /* List syscall filtering rules */
+#define AUDIT_ADD               1003    /* Add syscall filtering rule */
+#define AUDIT_DEL               1004    /* Delete syscall filtering rule */
+#define AUDIT_USER              1005    /* Message from userspace -- deprecated */
+#define AUDIT_LOGIN             1006    /* Define the login id and information */
+#define AUDIT_WATCH_INS         1007    /* Insert file/dir watch entry */
+#define AUDIT_WATCH_REM         1008    /* Remove file/dir watch entry */
+#define AUDIT_WATCH_LIST        1009    /* List all file/dir watches */
+#define AUDIT_SIGNAL_INFO       1010    /* Get info about sender of signal to auditd */
+
+#define AUDIT_USER_AUTH         1100    /* User space authentication */
+#define AUDIT_USER_ACCT         1101    /* User space acct change */
+#define AUDIT_USER_MGMT         1102    /* User space acct management */
+#define AUDIT_CRED_ACQ          1103    /* User space credential acquired */
+#define AUDIT_CRED_DISP         1104    /* User space credential disposed */
+#define AUDIT_USER_START        1105    /* User space session start */ 
+#define AUDIT_USER_END          1106    /* User space session end */
+#define AUDIT_USER_AVC          1107    /* User space avc message */
+ 
+#define AUDIT_DAEMON_START      1200    /* Daemon startup record */
+#define AUDIT_DAEMON_END        1201    /* Daemon normal stop record */
+#define AUDIT_DAEMON_ABORT      1202    /* Daemon error stop record */
+#define AUDIT_DAEMON_CONFIG     1203    /* Daemon config change */
+
+#define AUDIT_SYSCALL           1300    /* Syscall event */
+#define AUDIT_FS_WATCH          1301    /* Filesystem watch event */
+#define AUDIT_PATH              1302    /* Filname path information */
+#define AUDIT_IPC               1303    /* IPC record */
+#define AUDIT_SOCKET            1304    /* Socket record */
+#define AUDIT_CONFIG_CHANGE     1305    /* Audit system configuration change */
+
+#define AUDIT_AVC               1400    /* SE Linux avc denial or grant */
+#define AUDIT_SELINUX_ERR       1401    /* Internal SE Linux Errors */
+
+#define AUDIT_KERNEL            2000    /* Asynchronous audit record. NOT A REQUEST. */
 
 /* Rule flags */
 #define AUDIT_PER_TASK 0x01     /* Apply rule at task creation (not syscall) */
@@ -141,7 +181,7 @@ struct audit_message {
 
 struct audit_status {
         __u32           mask;           /* Bit mask for valid entries */
-        __u32           enabled;        /* 1 = enabled, 0 = disbaled */
+        __u32           enabled;        /* 1 = enabled, 0 = disabled */
         __u32           failure;        /* Failure-to-log action */
         __u32           pid;            /* pid of auditd process */
         __u32           rate_limit;     /* messages rate limit (per second) */
@@ -161,6 +201,11 @@ struct audit_rule {		/* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */
 
 #ifdef __KERNEL__
 
+struct audit_sig_info {
+        uid_t           uid;
+        pid_t           pid;
+};
+
 struct audit_buffer;
 struct audit_context;
 struct inode;
@@ -185,11 +230,12 @@ extern void audit_inode(const char *name, const struct inode *inode);
                                 /* Private API (for audit.c only) */
 extern int  audit_receive_filter(int type, int pid, int uid, int seq,
                                  void *data, uid_t loginuid);
-extern void audit_get_stamp(struct audit_context *ctx,
+extern int audit_get_stamp(struct audit_context *ctx,
                             struct timespec *t, unsigned int *serial);
 extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);
 extern uid_t audit_get_loginuid(struct audit_context *ctx);
 extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);
+extern void audit_signal_info(int sig, struct task_struct *t);
 #else
 #define audit_alloc(t) ({ 0; })
 #define audit_free(t) do { ; } while (0)
@@ -198,18 +244,21 @@ extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mo
 #define audit_getname(n) do { ; } while (0)
 #define audit_putname(n) do { ; } while (0)
 #define audit_inode(n,i) do { ; } while (0)
+#define audit_receive_filter(t,p,u,s,d,l) ({ -EOPNOTSUPP; })
+#define audit_get_stamp(c,t,s) ({ 0; })
 #define audit_get_loginuid(c) ({ -1; })
 #define audit_ipc_perms(q,u,g,m) ({ 0; })
+#define audit_signal_info(s,t) do { ; } while (0)
 #endif
 
 #ifdef CONFIG_AUDIT
 /* These are defined in audit.c */
                                 /* Public API */
-extern void                 audit_log(struct audit_context *ctx,
+extern void                 audit_log(struct audit_context *ctx, int type,
                                       const char *fmt, ...)
-                            __attribute__((format(printf,2,3)));
+                            __attribute__((format(printf,3,4)));
 
-extern struct audit_buffer *audit_log_start(struct audit_context *ctx);
+extern struct audit_buffer *audit_log_start(struct audit_context *ctx,int type);
 extern void                 audit_log_format(struct audit_buffer *ab,
                                              const char *fmt, ...)
                             __attribute__((format(printf,2,3)));
@@ -229,8 +278,8 @@ extern void		    audit_send_reply(int pid, int seq, int type,
                                              void *payload, int size);
 extern void                 audit_log_lost(const char *message);
 #else
-#define audit_log(t,f,...) do { ; } while (0)
-#define audit_log_start(t) ({ NULL; })
+#define audit_log(c,t,f,...) do { ; } while (0)
+#define audit_log_start(c,t) ({ NULL; })
 #define audit_log_vformat(b,f,a) do { ; } while (0)
 #define audit_log_format(b,f,...) do { ; } while (0)
 #define audit_log_end(b) do { ; } while (0)