Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'audit.b29' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b29' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] sparc64 audit syscall classes hookup
[PATCH] syscall class hookup for all normal targets
+134
-1
-1
arch/i386/kernel/Makefile
-1
arch/i386/kernel/Makefile
+2
arch/i386/kernel/audit.c
lib/audit.c
+2
arch/i386/kernel/audit.c
lib/audit.c
+4
arch/ia64/Kconfig
+4
arch/ia64/Kconfig
+4
arch/powerpc/Kconfig
+4
arch/powerpc/Kconfig
+4
arch/s390/Kconfig
+4
arch/s390/Kconfig
+4
arch/sparc64/Kconfig
+4
arch/sparc64/Kconfig
+3
arch/sparc64/kernel/Makefile
+3
arch/sparc64/kernel/Makefile
···
25
25
obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o
26
26
obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o
27
27
obj-$(CONFIG_KPROBES) += kprobes.o
28
+
obj-$(CONFIG_AUDIT) += audit.o
29
+
obj-$(CONFIG_AUDIT)$(CONFIG_SPARC32_COMPAT) += compat_audit.o
30
+
obj-y += $(obj-yy)
28
31
29
32
ifdef CONFIG_SUNOS_EMUL
30
33
obj-y += sys_sunos32.o sunos_ioctl32.o
+66
arch/sparc64/kernel/audit.c
+66
arch/sparc64/kernel/audit.c
···
1
+
#include <linux/init.h>
2
+
#include <linux/types.h>
3
+
#include <linux/audit.h>
4
+
#include <asm/unistd.h>
5
+
6
+
static unsigned dir_class[] = {
7
+
#include <asm-generic/audit_dir_write.h>
8
+
~0U
9
+
};
10
+
11
+
static unsigned read_class[] = {
12
+
#include <asm-generic/audit_read.h>
13
+
~0U
14
+
};
15
+
16
+
static unsigned write_class[] = {
17
+
#include <asm-generic/audit_write.h>
18
+
~0U
19
+
};
20
+
21
+
static unsigned chattr_class[] = {
22
+
#include <asm-generic/audit_change_attr.h>
23
+
~0U
24
+
};
25
+
26
+
int audit_classify_syscall(int abi, unsigned syscall)
27
+
{
28
+
#ifdef CONFIG_SPARC32_COMPAT
29
+
extern int sparc32_classify_syscall(unsigned);
30
+
if (abi == AUDIT_ARCH_SPARC)
31
+
return sparc32_classify_syscall(syscall);
32
+
#endif
33
+
switch(syscall) {
34
+
case __NR_open:
35
+
return 2;
36
+
case __NR_openat:
37
+
return 3;
38
+
case __NR_socketcall:
39
+
return 4;
40
+
case __NR_execve:
41
+
return 5;
42
+
default:
43
+
return 0;
44
+
}
45
+
}
46
+
47
+
static int __init audit_classes_init(void)
48
+
{
49
+
#ifdef CONFIG_SPARC32_COMPAT
50
+
extern __u32 sparc32_dir_class[];
51
+
extern __u32 sparc32_write_class[];
52
+
extern __u32 sparc32_read_class[];
53
+
extern __u32 sparc32_chattr_class[];
54
+
audit_register_class(AUDIT_CLASS_WRITE_32, sparc32_write_class);
55
+
audit_register_class(AUDIT_CLASS_READ_32, sparc32_read_class);
56
+
audit_register_class(AUDIT_CLASS_DIR_WRITE_32, sparc32_dir_class);
57
+
audit_register_class(AUDIT_CLASS_CHATTR_32, sparc32_chattr_class);
58
+
#endif
59
+
audit_register_class(AUDIT_CLASS_WRITE, write_class);
60
+
audit_register_class(AUDIT_CLASS_READ, read_class);
61
+
audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
62
+
audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
63
+
return 0;
64
+
}
65
+
66
+
__initcall(audit_classes_init);
+37
arch/sparc64/kernel/compat_audit.c
+37
arch/sparc64/kernel/compat_audit.c
···
1
+
#include <asm-sparc/unistd.h>
2
+
3
+
unsigned sparc32_dir_class[] = {
4
+
#include <asm-generic/audit_dir_write.h>
5
+
~0U
6
+
};
7
+
8
+
unsigned sparc32_chattr_class[] = {
9
+
#include <asm-generic/audit_change_attr.h>
10
+
~0U
11
+
};
12
+
13
+
unsigned sparc32_write_class[] = {
14
+
#include <asm-generic/audit_write.h>
15
+
~0U
16
+
};
17
+
18
+
unsigned sparc32_read_class[] = {
19
+
#include <asm-generic/audit_read.h>
20
+
~0U
21
+
};
22
+
23
+
int sparc32_classify_syscall(unsigned syscall)
24
+
{
25
+
switch(syscall) {
26
+
case __NR_open:
27
+
return 2;
28
+
case __NR_openat:
29
+
return 3;
30
+
case __NR_socketcall:
31
+
return 4;
32
+
case __NR_execve:
33
+
return 5;
34
+
default:
35
+
return 1;
36
+
}
37
+
}
+4
arch/x86_64/Kconfig
+4
arch/x86_64/Kconfig
+5
lib/Kconfig
+5
lib/Kconfig