Merge branch 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] Abnormal End of Processes
  [PATCH] match audit name data
  [PATCH] complete message queue auditing
  [PATCH] audit inode for all xattr syscalls
  [PATCH] initialize name osid
  [PATCH] audit signal recipients
  [PATCH] add SIGNAL syscall class (v3)
  [PATCH] auditing ptrace

10 files changed, 110 insertions, 0 deletions

diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
index 92d7d0c8d93f..8850fe40ea34 100644
--- a/arch/ia64/ia32/audit.c
+++ b/arch/ia64/ia32/audit.c
@@ -20,6 +20,11 @@ unsigned ia32_read_class[] = {
 ~0U
 };
 
+unsigned ia32_signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
 int ia32_classify_syscall(unsigned syscall)
 {
         switch(syscall) {
diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c
index 04682555a28c..f3802ae89b10 100644
--- a/arch/ia64/kernel/audit.c
+++ b/arch/ia64/kernel/audit.c
@@ -23,6 +23,20 @@ static unsigned chattr_class[] = {
 ~0U
 };
 
+static unsigned signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
+int audit_classify_arch(int arch)
+{
+#ifdef CONFIG_IA32_SUPPORT
+        if (arch == AUDIT_ARCH_I386)
+                return 1;
+#endif
+        return 0;
+}
+
 int audit_classify_syscall(int abi, unsigned syscall)
 {
 #ifdef CONFIG_IA32_SUPPORT
@@ -49,15 +63,18 @@ static int __init audit_classes_init(void)
         extern __u32 ia32_write_class[];
         extern __u32 ia32_read_class[];
         extern __u32 ia32_chattr_class[];
+        extern __u32 ia32_signal_class[];
         audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);
         audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL_32, ia32_signal_class);
 #endif
         audit_register_class(AUDIT_CLASS_WRITE, write_class);
         audit_register_class(AUDIT_CLASS_READ, read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);
         return 0;
 }
 
diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c
index 7fe5e6300e9a..a4dab7cab348 100644
--- a/arch/powerpc/kernel/audit.c
+++ b/arch/powerpc/kernel/audit.c
@@ -23,6 +23,20 @@ static unsigned chattr_class[] = {
 ~0U
 };
 
+static unsigned signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
+int audit_classify_arch(int arch)
+{
+#ifdef CONFIG_PPC64
+        if (arch == AUDIT_ARCH_PPC)
+                return 1;
+#endif
+        return 0;
+}
+
 int audit_classify_syscall(int abi, unsigned syscall)
 {
 #ifdef CONFIG_PPC64
@@ -51,15 +65,18 @@ static int __init audit_classes_init(void)
         extern __u32 ppc32_write_class[];
         extern __u32 ppc32_read_class[];
         extern __u32 ppc32_chattr_class[];
+        extern __u32 ppc32_signal_class[];
         audit_register_class(AUDIT_CLASS_WRITE_32, ppc32_write_class);
         audit_register_class(AUDIT_CLASS_READ_32, ppc32_read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ppc32_dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR_32, ppc32_chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL_32, ppc32_signal_class);
 #endif
         audit_register_class(AUDIT_CLASS_WRITE, write_class);
         audit_register_class(AUDIT_CLASS_READ, read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);
         return 0;
 }
 
diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c
index 640d4bb29321..108ff14e2122 100644
--- a/arch/powerpc/kernel/compat_audit.c
+++ b/arch/powerpc/kernel/compat_audit.c
@@ -21,6 +21,11 @@ unsigned ppc32_read_class[] = {
 ~0U
 };
 
+unsigned ppc32_signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
 int ppc32_classify_syscall(unsigned syscall)
 {
         switch(syscall) {
diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c
index 0741d9193390..d1c76fe10f29 100644
--- a/arch/s390/kernel/audit.c
+++ b/arch/s390/kernel/audit.c
@@ -23,6 +23,20 @@ static unsigned chattr_class[] = {
 ~0U
 };
 
+static unsigned signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
+int audit_classify_arch(int arch)
+{
+#ifdef CONFIG_COMPAT
+        if (arch == AUDIT_ARCH_S390)
+                return 1;
+#endif
+        return 0;
+}
+
 int audit_classify_syscall(int abi, unsigned syscall)
 {
 #ifdef CONFIG_COMPAT
@@ -51,15 +65,18 @@ static int __init audit_classes_init(void)
         extern __u32 s390_write_class[];
         extern __u32 s390_read_class[];
         extern __u32 s390_chattr_class[];
+        extern __u32 s390_signal_class[];
         audit_register_class(AUDIT_CLASS_WRITE_32, s390_write_class);
         audit_register_class(AUDIT_CLASS_READ_32, s390_read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE_32, s390_dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR_32, s390_chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL_32, s390_signal_class);
 #endif
         audit_register_class(AUDIT_CLASS_WRITE, write_class);
         audit_register_class(AUDIT_CLASS_READ, read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);
         return 0;
 }
 
diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c
index 16d9436bfa91..0569f5126e49 100644
--- a/arch/s390/kernel/compat_audit.c
+++ b/arch/s390/kernel/compat_audit.c
@@ -21,6 +21,11 @@ unsigned s390_read_class[] = {
 ~0U
 };
 
+unsigned s390_signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
 int s390_classify_syscall(unsigned syscall)
 {
         switch(syscall) {
diff --git a/arch/sparc64/kernel/audit.c b/arch/sparc64/kernel/audit.c
index aef19cc27072..24d7f4b4178a 100644
--- a/arch/sparc64/kernel/audit.c
+++ b/arch/sparc64/kernel/audit.c
@@ -23,6 +23,20 @@ static unsigned chattr_class[] = {
 ~0U
 };
 
+static unsigned signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
+int audit_classify_arch(int arch)
+{
+#ifdef CONFIG_SPARC32_COMPAT
+        if (arch == AUDIT_ARCH_SPARC)
+                return 1;
+#endif
+        return 0;
+}
+
 int audit_classify_syscall(int abi, unsigned syscall)
 {
 #ifdef CONFIG_SPARC32_COMPAT
@@ -51,15 +65,18 @@ static int __init audit_classes_init(void)
         extern __u32 sparc32_write_class[];
         extern __u32 sparc32_read_class[];
         extern __u32 sparc32_chattr_class[];
+        extern __u32 sparc32_signal_class[];
         audit_register_class(AUDIT_CLASS_WRITE_32, sparc32_write_class);
         audit_register_class(AUDIT_CLASS_READ_32, sparc32_read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE_32, sparc32_dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR_32, sparc32_chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL_32, sparc32_signal_class);
 #endif
         audit_register_class(AUDIT_CLASS_WRITE, write_class);
         audit_register_class(AUDIT_CLASS_READ, read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);
         return 0;
 }
 
diff --git a/arch/sparc64/kernel/compat_audit.c b/arch/sparc64/kernel/compat_audit.c
index cca96c91b780..c1979482aa92 100644
--- a/arch/sparc64/kernel/compat_audit.c
+++ b/arch/sparc64/kernel/compat_audit.c
@@ -20,6 +20,11 @@ unsigned sparc32_read_class[] = {
 ~0U
 };
 
+unsigned sparc32_signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
 int sparc32_classify_syscall(unsigned syscall)
 {
         switch(syscall) {
diff --git a/arch/x86_64/ia32/audit.c b/arch/x86_64/ia32/audit.c
index 92d7d0c8d93f..8850fe40ea34 100644
--- a/arch/x86_64/ia32/audit.c
+++ b/arch/x86_64/ia32/audit.c
@@ -20,6 +20,11 @@ unsigned ia32_read_class[] = {
 ~0U
 };
 
+unsigned ia32_signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
 int ia32_classify_syscall(unsigned syscall)
 {
         switch(syscall) {
diff --git a/arch/x86_64/kernel/audit.c b/arch/x86_64/kernel/audit.c
index 21f33387bef3..06d3e5a14d9d 100644
--- a/arch/x86_64/kernel/audit.c
+++ b/arch/x86_64/kernel/audit.c
@@ -23,6 +23,20 @@ static unsigned chattr_class[] = {
 ~0U
 };
 
+static unsigned signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
+int audit_classify_arch(int arch)
+{
+#ifdef CONFIG_IA32_EMULATION
+        if (arch == AUDIT_ARCH_I386)
+                return 1;
+#endif
+        return 0;
+}
+
 int audit_classify_syscall(int abi, unsigned syscall)
 {
 #ifdef CONFIG_IA32_EMULATION
@@ -49,15 +63,18 @@ static int __init audit_classes_init(void)
         extern __u32 ia32_write_class[];
         extern __u32 ia32_read_class[];
         extern __u32 ia32_chattr_class[];
+        extern __u32 ia32_signal_class[];
         audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);
         audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL_32, ia32_signal_class);
 #endif
         audit_register_class(AUDIT_CLASS_WRITE, write_class);
         audit_register_class(AUDIT_CLASS_READ, read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
         audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);
         return 0;
 }