mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audit: replace magic audit syscall class numbers with macros

Browse Source 
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: Richard Guy Briggs <rgb@redhat.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
[PM: renamed header to audit_arch.h after consulting with Richard]
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Richard Guy Briggs
2021-05-19 16:00:20 -04:00
committed by Paul Moore
parent 8e71168e2c
commit 42f355ef59
18 changed files with 102 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/compat_audit.c
View File

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/init.h>
#include <linux/types.h>
#include <linux/audit_arch.h>
#include <asm/unistd32.h>
unsigned compat_dir_class[] = {
@@ -33,19 +34,19 @@ int audit_classify_compat_syscall(int abi, unsigned syscall)
switch (syscall) {
#ifdef __NR_open
case __NR_open:
return 2;
return AUDITSC_OPEN;
#endif
#ifdef __NR_openat
case __NR_openat:
return 3;
return AUDITSC_OPENAT;
#endif
#ifdef __NR_socketcall
case __NR_socketcall:
return 4;
return AUDITSC_SOCKETCALL;
#endif
case __NR_execve:
return 5;
return AUDITSC_EXECVE;
default:
return 1;
return AUDITSC_COMPAT;
}
}