Merge tag 'for-linus-20170713' of git://git.infradead.org/linux-mtd

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / audit.c

diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c
index 7fe5e6300e9a2e2447ef08a5970b53d12743c73f..a4dab7cab3489f7685d1829bff92f7480a476a4d 100644 (file)
--- 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;
 }