Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b588411 authored by AKASHI Takahiro's avatar AKASHI Takahiro Committed by Eric Paris
Browse files

audit: Add generic compat syscall support 



lib/audit.c provides a generic function for auditing system calls.
This patch extends it for compat syscall support on bi-architectures
(32/64-bit) by adding lib/compat_audit.c.
What is required to support this feature are:
 * add asm/unistd32.h for compat system call names
 * select CONFIG_AUDIT_ARCH_COMPAT_GENERIC

Signed-off-by: default avatarAKASHI Takahiro <takahiro.akashi@linaro.org>
Acked-by: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 7a017721

include/linux/audit.h

+8 −0
Original line number Diff line number Diff line
@@ -79,6 +79,14 @@ extern int is_audit_feature_set(int which); 
extern int __init audit_register_class(int class, unsigned *list);

extern int audit_classify_syscall(int abi, unsigned syscall);

extern int audit_classify_arch(int arch);

/* only for compat system calls */

extern unsigned compat_write_class[];

extern unsigned compat_read_class[];

extern unsigned compat_dir_class[];

extern unsigned compat_chattr_class[];

extern unsigned compat_signal_class[];



extern int __weak audit_classify_compat_syscall(int abi, unsigned syscall);



/* audit_names->type values */

#define	AUDIT_TYPE_UNKNOWN	0	/* we don't know yet */

include/uapi/linux/audit.h

+6 −0
Original line number Diff line number Diff line
@@ -362,6 +362,12 @@ enum { 
#define AUDIT_ARCH_SPARC64	(EM_SPARCV9|__AUDIT_ARCH_64BIT)

#define AUDIT_ARCH_X86_64	(EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)



#ifdef CONFIG_COMPAT

#define audit_is_compat(arch)	(!((arch) & __AUDIT_ARCH_64BIT))

#else

#define audit_is_compat(arch)	false

#endif



#define AUDIT_PERM_EXEC		1

#define AUDIT_PERM_WRITE	2

#define AUDIT_PERM_READ		4

lib/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -182,6 +182,15 @@ config AUDIT_GENERIC 
	depends on AUDIT && !AUDIT_ARCH

	default y



config AUDIT_ARCH_COMPAT_GENERIC

	bool

	default n



config AUDIT_COMPAT_GENERIC

	bool

	depends on AUDIT_GENERIC && AUDIT_ARCH_COMPAT_GENERIC && COMPAT

	default y



config RANDOM32_SELFTEST

	bool "PRNG perform self test on init"

	default n

lib/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o 
obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o

obj-$(CONFIG_SMP) += percpu_counter.o

obj-$(CONFIG_AUDIT_GENERIC) += audit.o

obj-$(CONFIG_AUDIT_COMPAT_GENERIC) += compat_audit.o



obj-$(CONFIG_SWIOTLB) += swiotlb.o

obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o

lib/audit.c

+14 −1
Original line number Diff line number Diff line
@@ -30,11 +30,17 @@ static unsigned signal_class[] = { 


int audit_classify_arch(int arch)

{

	if (audit_is_compat(arch))

		return 1;

	else

		return 0;

}



int audit_classify_syscall(int abi, unsigned syscall)

{

	if (audit_is_compat(abi))

		return audit_classify_compat_syscall(abi, syscall);



	switch(syscall) {

#ifdef __NR_open

	case __NR_open:
@@ -57,6 +63,13 @@ int audit_classify_syscall(int abi, unsigned syscall) 


static int __init audit_classes_init(void)

{

#ifdef CONFIG_AUDIT_COMPAT_GENERIC

	audit_register_class(AUDIT_CLASS_WRITE_32, compat_write_class);

	audit_register_class(AUDIT_CLASS_READ_32, compat_read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, compat_dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, compat_chattr_class);

	audit_register_class(AUDIT_CLASS_SIGNAL_32, compat_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);