| Message ID | dc14509a28a993738b1325211f412be72a4f9b1e.1629701132.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2] powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC | expand |
| Related | show |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 25 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 8 jobs. |
On 8/23/21 8:49 AM, Christophe Leroy wrote: > Commit e65e1fc2d24b ("[PATCH] syscall class hookup for all normal > targets") added generic support for AUDIT but that didn't include > support for bi-arch like powerpc. > > Commit 4b58841149dc ("audit: Add generic compat syscall support") > added generic support for bi-arch. > > Convert powerpc to that bi-arch generic audit support. > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > v2: > - Missing 'git add' for arch/powerpc/include/asm/unistd32.h > - Finalised commit description > --- > arch/powerpc/Kconfig | 5 +- > arch/powerpc/include/asm/unistd32.h | 7 +++ > arch/powerpc/kernel/Makefile | 3 -- > arch/powerpc/kernel/audit.c | 84 ----------------------------- > arch/powerpc/kernel/compat_audit.c | 44 --------------- > 5 files changed, 8 insertions(+), 135 deletions(-) > create mode 100644 arch/powerpc/include/asm/unistd32.h > delete mode 100644 arch/powerpc/kernel/audit.c > delete mode 100644 arch/powerpc/kernel/compat_audit.c > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 663766fbf505..5472358609d2 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -163,6 +163,7 @@ config PPC > select ARCH_WANT_IRQS_OFF_ACTIVATE_MM > select ARCH_WANT_LD_ORPHAN_WARN > select ARCH_WEAK_RELEASE_ACQUIRE > + select AUDIT_ARCH_COMPAT_GENERIC > select BINFMT_ELF > select BUILDTIME_TABLE_SORT > select CLONE_BACKWARDS > @@ -316,10 +317,6 @@ config GENERIC_TBSYNC > bool > default y if PPC32 && SMP > > -config AUDIT_ARCH > - bool > - default y > - > config GENERIC_BUG > bool > default y > diff --git a/arch/powerpc/include/asm/unistd32.h b/arch/powerpc/include/asm/unistd32.h > new file mode 100644 > index 000000000000..07689897d206 > --- /dev/null > +++ b/arch/powerpc/include/asm/unistd32.h > @@ -0,0 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +#ifndef _ASM_POWERPC_UNISTD32_H_ > +#define _ASM_POWERPC_UNISTD32_H_ > + > +#include <asm/unistd_32.h> > + > +#endif /* _ASM_POWERPC_UNISTD32_H_ */ > diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile > index 7be36c1e1db6..825121eba3c2 100644 > --- a/arch/powerpc/kernel/Makefile > +++ b/arch/powerpc/kernel/Makefile > @@ -125,9 +125,6 @@ obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \ > pci-common.o pci_of_scan.o > obj-$(CONFIG_PCI_MSI) += msi.o > > -obj-$(CONFIG_AUDIT) += audit.o > -obj64-$(CONFIG_AUDIT) += compat_audit.o > - > obj-$(CONFIG_PPC_IO_WORKAROUNDS) += io-workarounds.o > > obj-y += trace/ > diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c > deleted file mode 100644 > index a2dddd7f3d09..000000000000 > --- a/arch/powerpc/kernel/audit.c > +++ /dev/null > @@ -1,84 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -#include <linux/init.h> > -#include <linux/types.h> > -#include <linux/audit.h> > -#include <asm/unistd.h> > - > -static unsigned dir_class[] = { > -#include <asm-generic/audit_dir_write.h> > -~0U > -}; > - > -static unsigned read_class[] = { > -#include <asm-generic/audit_read.h> > -~0U > -}; > - > -static unsigned write_class[] = { > -#include <asm-generic/audit_write.h> > -~0U > -}; > - > -static unsigned chattr_class[] = { > -#include <asm-generic/audit_change_attr.h> > -~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 > - extern int ppc32_classify_syscall(unsigned); > - if (abi == AUDIT_ARCH_PPC) > - return ppc32_classify_syscall(syscall); > -#endif > - switch(syscall) { > - case __NR_open: > - return 2; > - case __NR_openat: > - return 3; > - case __NR_socketcall: > - return 4; > - case __NR_execve: > - return 5; > - default: > - return 0; > - } > -} > - > -static int __init audit_classes_init(void) > -{ > -#ifdef CONFIG_PPC64 > - extern __u32 ppc32_dir_class[]; > - 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; > -} > - > -__initcall(audit_classes_init); > diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c > deleted file mode 100644 > index 55c6ccda0a85..000000000000 > --- a/arch/powerpc/kernel/compat_audit.c > +++ /dev/null > @@ -1,44 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -#undef __powerpc64__ > -#include <asm/unistd.h> > - > -unsigned ppc32_dir_class[] = { > -#include <asm-generic/audit_dir_write.h> > -~0U > -}; > - > -unsigned ppc32_chattr_class[] = { > -#include <asm-generic/audit_change_attr.h> > -~0U > -}; > - > -unsigned ppc32_write_class[] = { > -#include <asm-generic/audit_write.h> > -~0U > -}; > - > -unsigned ppc32_read_class[] = { > -#include <asm-generic/audit_read.h> > -~0U > -}; > - > -unsigned ppc32_signal_class[] = { > -#include <asm-generic/audit_signal.h> > -~0U > -}; > - > -int ppc32_classify_syscall(unsigned syscall) > -{ > - switch(syscall) { > - case __NR_open: > - return 2; > - case __NR_openat: > - return 3; > - case __NR_socketcall: > - return 4; > - case __NR_execve: > - return 5; > - default: > - return 1; > - } > -} >
Christophe Leroy <christophe.leroy@csgroup.eu> writes: > Commit e65e1fc2d24b ("[PATCH] syscall class hookup for all normal > targets") added generic support for AUDIT but that didn't include > support for bi-arch like powerpc. > > Commit 4b58841149dc ("audit: Add generic compat syscall support") > added generic support for bi-arch. > > Convert powerpc to that bi-arch generic audit support. > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > v2: > - Missing 'git add' for arch/powerpc/include/asm/unistd32.h > - Finalised commit description > --- > arch/powerpc/Kconfig | 5 +- > arch/powerpc/include/asm/unistd32.h | 7 +++ > arch/powerpc/kernel/Makefile | 3 -- > arch/powerpc/kernel/audit.c | 84 ----------------------------- > arch/powerpc/kernel/compat_audit.c | 44 --------------- > 5 files changed, 8 insertions(+), 135 deletions(-) > create mode 100644 arch/powerpc/include/asm/unistd32.h > delete mode 100644 arch/powerpc/kernel/audit.c > delete mode 100644 arch/powerpc/kernel/compat_audit.c This looks OK, but I don't know much about audit. Can you resend with the audit maintainers on Cc? cheers
Le 24/08/2021 à 15:24, Michael Ellerman a écrit : > Christophe Leroy <christophe.leroy@csgroup.eu> writes: >> Commit e65e1fc2d24b ("[PATCH] syscall class hookup for all normal >> targets") added generic support for AUDIT but that didn't include >> support for bi-arch like powerpc. >> >> Commit 4b58841149dc ("audit: Add generic compat syscall support") >> added generic support for bi-arch. >> >> Convert powerpc to that bi-arch generic audit support. >> >> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> >> --- >> v2: >> - Missing 'git add' for arch/powerpc/include/asm/unistd32.h >> - Finalised commit description >> --- >> arch/powerpc/Kconfig | 5 +- >> arch/powerpc/include/asm/unistd32.h | 7 +++ >> arch/powerpc/kernel/Makefile | 3 -- >> arch/powerpc/kernel/audit.c | 84 ----------------------------- >> arch/powerpc/kernel/compat_audit.c | 44 --------------- >> 5 files changed, 8 insertions(+), 135 deletions(-) >> create mode 100644 arch/powerpc/include/asm/unistd32.h >> delete mode 100644 arch/powerpc/kernel/audit.c >> delete mode 100644 arch/powerpc/kernel/compat_audit.c > > This looks OK, but I don't know much about audit. > > Can you resend with the audit maintainers on Cc? > Sure.
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 663766fbf505..5472358609d2 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -163,6 +163,7 @@ config PPC select ARCH_WANT_IRQS_OFF_ACTIVATE_MM select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WEAK_RELEASE_ACQUIRE + select AUDIT_ARCH_COMPAT_GENERIC select BINFMT_ELF select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS @@ -316,10 +317,6 @@ config GENERIC_TBSYNC bool default y if PPC32 && SMP -config AUDIT_ARCH - bool - default y - config GENERIC_BUG bool default y diff --git a/arch/powerpc/include/asm/unistd32.h b/arch/powerpc/include/asm/unistd32.h new file mode 100644 index 000000000000..07689897d206 --- /dev/null +++ b/arch/powerpc/include/asm/unistd32.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _ASM_POWERPC_UNISTD32_H_ +#define _ASM_POWERPC_UNISTD32_H_ + +#include <asm/unistd_32.h> + +#endif /* _ASM_POWERPC_UNISTD32_H_ */ diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 7be36c1e1db6..825121eba3c2 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -125,9 +125,6 @@ obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \ pci-common.o pci_of_scan.o obj-$(CONFIG_PCI_MSI) += msi.o -obj-$(CONFIG_AUDIT) += audit.o -obj64-$(CONFIG_AUDIT) += compat_audit.o - obj-$(CONFIG_PPC_IO_WORKAROUNDS) += io-workarounds.o obj-y += trace/ diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c deleted file mode 100644 index a2dddd7f3d09..000000000000 --- a/arch/powerpc/kernel/audit.c +++ /dev/null @@ -1,84 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <linux/init.h> -#include <linux/types.h> -#include <linux/audit.h> -#include <asm/unistd.h> - -static unsigned dir_class[] = { -#include <asm-generic/audit_dir_write.h> -~0U -}; - -static unsigned read_class[] = { -#include <asm-generic/audit_read.h> -~0U -}; - -static unsigned write_class[] = { -#include <asm-generic/audit_write.h> -~0U -}; - -static unsigned chattr_class[] = { -#include <asm-generic/audit_change_attr.h> -~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 - extern int ppc32_classify_syscall(unsigned); - if (abi == AUDIT_ARCH_PPC) - return ppc32_classify_syscall(syscall); -#endif - switch(syscall) { - case __NR_open: - return 2; - case __NR_openat: - return 3; - case __NR_socketcall: - return 4; - case __NR_execve: - return 5; - default: - return 0; - } -} - -static int __init audit_classes_init(void) -{ -#ifdef CONFIG_PPC64 - extern __u32 ppc32_dir_class[]; - 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; -} - -__initcall(audit_classes_init); diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c deleted file mode 100644 index 55c6ccda0a85..000000000000 --- a/arch/powerpc/kernel/compat_audit.c +++ /dev/null @@ -1,44 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#undef __powerpc64__ -#include <asm/unistd.h> - -unsigned ppc32_dir_class[] = { -#include <asm-generic/audit_dir_write.h> -~0U -}; - -unsigned ppc32_chattr_class[] = { -#include <asm-generic/audit_change_attr.h> -~0U -}; - -unsigned ppc32_write_class[] = { -#include <asm-generic/audit_write.h> -~0U -}; - -unsigned ppc32_read_class[] = { -#include <asm-generic/audit_read.h> -~0U -}; - -unsigned ppc32_signal_class[] = { -#include <asm-generic/audit_signal.h> -~0U -}; - -int ppc32_classify_syscall(unsigned syscall) -{ - switch(syscall) { - case __NR_open: - return 2; - case __NR_openat: - return 3; - case __NR_socketcall: - return 4; - case __NR_execve: - return 5; - default: - return 1; - } -}
Commit e65e1fc2d24b ("[PATCH] syscall class hookup for all normal targets") added generic support for AUDIT but that didn't include support for bi-arch like powerpc. Commit 4b58841149dc ("audit: Add generic compat syscall support") added generic support for bi-arch. Convert powerpc to that bi-arch generic audit support. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- v2: - Missing 'git add' for arch/powerpc/include/asm/unistd32.h - Finalised commit description --- arch/powerpc/Kconfig | 5 +- arch/powerpc/include/asm/unistd32.h | 7 +++ arch/powerpc/kernel/Makefile | 3 -- arch/powerpc/kernel/audit.c | 84 ----------------------------- arch/powerpc/kernel/compat_audit.c | 44 --------------- 5 files changed, 8 insertions(+), 135 deletions(-) create mode 100644 arch/powerpc/include/asm/unistd32.h delete mode 100644 arch/powerpc/kernel/audit.c delete mode 100644 arch/powerpc/kernel/compat_audit.c