Commit b7472e17 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Revert "powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC" 



This reverts commit 566af8cd.

This caused some conflicts vs the audit tree, and the audit maintainers
would prefer we postpone this to the next merge window so we have more
time for testing.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 319fa1a5

arch/powerpc/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ 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
@@ -317,6 +316,10 @@ config GENERIC_TBSYNC 
	bool

	default y if PPC32 && SMP



config AUDIT_ARCH

	bool

	default y



config GENERIC_BUG

	bool

	default y

arch/powerpc/include/asm/unistd32.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
/* 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_ */

arch/powerpc/kernel/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ 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/

arch/powerpc/kernel/audit.c

0 → 100644
+84 −0
Original line number Diff line number Diff line 
// 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);

arch/powerpc/kernel/compat_audit.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// 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;

	}

}