Commit 42f355ef authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Paul Moore
Browse files

audit: replace magic audit syscall class numbers with macros 

Replace audit syscall class magic numbers with macros.

This required putting the macros into new header file
include/linux/audit_arch.h since the syscall macros were
included for both 64 bit and 32 bit in any compat code, causing
redefinition warnings.

Link: https://lore.kernel.org/r/2300b1083a32aade7ae7efb95826e8f3f260b1df.1621363275.git.rgb@redhat.com


Signed-off-by: default avatarRichard Guy Briggs <rgb@redhat.com>
Acked-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
[PM: renamed header to audit_arch.h after consulting with Richard]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 8e71168e

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3113,6 +3113,7 @@ W: https://github.com/linux-audit 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git

F:	include/asm-generic/audit_*.h

F:	include/linux/audit.h

F:	include/linux/audit_arch.h

F:	include/uapi/linux/audit.h

F:	kernel/audit*

F:	lib/*audit.c

arch/alpha/kernel/audit.c

+4 −4
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ int audit_classify_syscall(int abi, unsigned syscall) 
{

	switch(syscall) {

	case __NR_open:

		return 2;

		return AUDITSC_OPEN;

	case __NR_openat:

		return 3;

		return AUDITSC_OPENAT;

	case __NR_execve:

		return 5;

		return AUDITSC_EXECVE;

	default:

		return 0;

		return AUDITSC_NATIVE;

	}

}

arch/ia64/kernel/audit.c

+4 −4
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ int audit_classify_syscall(int abi, unsigned syscall) 
{

	switch(syscall) {

	case __NR_open:

		return 2;

		return AUDITSC_OPEN;

	case __NR_openat:

		return 3;

		return AUDITSC_OPENAT;

	case __NR_execve:

		return 5;

		return AUDITSC_EXECVE;

	default:

		return 0;

		return AUDITSC_NATIVE;

	}

}

arch/parisc/kernel/audit.c

+4 −4
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ int audit_classify_syscall(int abi, unsigned syscall) 
#endif

	switch (syscall) {

	case __NR_open:

		return 2;

		return AUDITSC_OPEN;

	case __NR_openat:

		return 3;

		return AUDITSC_OPENAT;

	case __NR_execve:

		return 5;

		return AUDITSC_EXECVE;

	default:

		return 0;

		return AUDITSC_NATIVE;

	}

}

arch/parisc/kernel/compat_audit.c

+5 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/audit_arch.h>

#include <asm/unistd.h>



unsigned int parisc32_dir_class[] = {
@@ -30,12 +31,12 @@ int parisc32_classify_syscall(unsigned syscall) 
{

	switch (syscall) {

	case __NR_open:

		return 2;

		return AUDITSC_OPEN;

	case __NR_openat:

		return 3;

		return AUDITSC_OPENAT;

	case __NR_execve:

		return 5;

		return AUDITSC_EXECVE;

	default:

		return 1;

		return AUDITSC_COMPAT;

	}

}