aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-12 20:37:24 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-12 20:37:24 -0400
commitbd314d976e22e82c55e96603804ed7cb0514d252 (patch)
tree098089ad3c5b98a13d63bce5f23d5a18b40c0e9c /arch
parent48c068e0f49b3c507cbd1c332f4acdd5fc193040 (diff)
parentf6bc0c1c5b0fe393efaf922e01887c33b35f2910 (diff)
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
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/Makefile1
-rw-r--r--arch/ia64/Kconfig4
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--arch/s390/Kconfig4
-rw-r--r--arch/sparc64/Kconfig4
-rw-r--r--arch/sparc64/kernel/Makefile3
-rw-r--r--arch/sparc64/kernel/audit.c (renamed from arch/i386/kernel/audit.c)15
-rw-r--r--arch/sparc64/kernel/compat_audit.c37
-rw-r--r--arch/x86_64/Kconfig4
9 files changed, 75 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index ab98fc21a541..5427a842e841 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_VM86) += vm86.o
39obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 39obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
40obj-$(CONFIG_HPET_TIMER) += hpet.o 40obj-$(CONFIG_HPET_TIMER) += hpet.o
41obj-$(CONFIG_K8_NB) += k8.o 41obj-$(CONFIG_K8_NB) += k8.o
42obj-$(CONFIG_AUDIT) += audit.o
43 42
44EXTRA_AFLAGS := -traditional 43EXTRA_AFLAGS := -traditional
45 44
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 674de8943478..db274da7dba1 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -75,6 +75,10 @@ config DMA_IS_NORMAL
75 depends on IA64_SGI_SN2 75 depends on IA64_SGI_SN2
76 default y 76 default y
77 77
78config AUDIT_ARCH
79 bool
80 default y
81
78choice 82choice
79 prompt "System type" 83 prompt "System type"
80 default IA64_GENERIC 84 default IA64_GENERIC
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 4d4b6fb156e1..694b0c63ee50 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -95,6 +95,10 @@ config GENERIC_TBSYNC
95 default y if PPC32 && SMP 95 default y if PPC32 && SMP
96 default n 96 default n
97 97
98config AUDIT_ARCH
99 bool
100 default y
101
98config DEFAULT_UIMAGE 102config DEFAULT_UIMAGE
99 bool 103 bool
100 help 104 help
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ae071a11ce71..2f4f70c4dbb2 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -118,6 +118,10 @@ config SYSVIPC_COMPAT
118 depends on COMPAT && SYSVIPC 118 depends on COMPAT && SYSVIPC
119 default y 119 default y
120 120
121config AUDIT_ARCH
122 bool
123 default y
124
121comment "Code generation options" 125comment "Code generation options"
122 126
123choice 127choice
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 8a36ba8868db..8d8ca716f7a7 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -34,6 +34,10 @@ config ARCH_MAY_HAVE_PC_FDC
34 bool 34 bool
35 default y 35 default y
36 36
37config AUDIT_ARCH
38 bool
39 default y
40
37choice 41choice
38 prompt "Kernel page size" 42 prompt "Kernel page size"
39 default SPARC64_PAGE_SIZE_8KB 43 default SPARC64_PAGE_SIZE_8KB
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index 86c9fe3f3e4a..e1eabebaed39 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -25,6 +25,9 @@ obj-$(CONFIG_MODULES) += module.o
25obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o 25obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o
26obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o 26obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o
27obj-$(CONFIG_KPROBES) += kprobes.o 27obj-$(CONFIG_KPROBES) += kprobes.o
28obj-$(CONFIG_AUDIT) += audit.o
29obj-$(CONFIG_AUDIT)$(CONFIG_SPARC32_COMPAT) += compat_audit.o
30obj-y += $(obj-yy)
28 31
29ifdef CONFIG_SUNOS_EMUL 32ifdef CONFIG_SUNOS_EMUL
30 obj-y += sys_sunos32.o sunos_ioctl32.o 33 obj-y += sys_sunos32.o sunos_ioctl32.o
diff --git a/arch/i386/kernel/audit.c b/arch/sparc64/kernel/audit.c
index 3b97cff41549..aef19cc27072 100644
--- a/arch/i386/kernel/audit.c
+++ b/arch/sparc64/kernel/audit.c
@@ -25,6 +25,11 @@ static unsigned chattr_class[] = {
25 25
26int audit_classify_syscall(int abi, unsigned syscall) 26int audit_classify_syscall(int abi, unsigned syscall)
27{ 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
28 switch(syscall) { 33 switch(syscall) {
29 case __NR_open: 34 case __NR_open:
30 return 2; 35 return 2;
@@ -41,6 +46,16 @@ int audit_classify_syscall(int abi, unsigned syscall)
41 46
42static int __init audit_classes_init(void) 47static int __init audit_classes_init(void)
43{ 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
44 audit_register_class(AUDIT_CLASS_WRITE, write_class); 59 audit_register_class(AUDIT_CLASS_WRITE, write_class);
45 audit_register_class(AUDIT_CLASS_READ, read_class); 60 audit_register_class(AUDIT_CLASS_READ, read_class);
46 audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); 61 audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
diff --git a/arch/sparc64/kernel/compat_audit.c b/arch/sparc64/kernel/compat_audit.c
new file mode 100644
index 000000000000..cca96c91b780
--- /dev/null
+++ b/arch/sparc64/kernel/compat_audit.c
@@ -0,0 +1,37 @@
1#include <asm-sparc/unistd.h>
2
3unsigned sparc32_dir_class[] = {
4#include <asm-generic/audit_dir_write.h>
5~0U
6};
7
8unsigned sparc32_chattr_class[] = {
9#include <asm-generic/audit_change_attr.h>
10~0U
11};
12
13unsigned sparc32_write_class[] = {
14#include <asm-generic/audit_write.h>
15~0U
16};
17
18unsigned sparc32_read_class[] = {
19#include <asm-generic/audit_read.h>
20~0U
21};
22
23int 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}
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 28df7d88ce2c..6cd4878625f1 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -85,6 +85,10 @@ config DMI
85 bool 85 bool
86 default y 86 default y
87 87
88config AUDIT_ARCH
89 bool
90 default y
91
88source "init/Kconfig" 92source "init/Kconfig"
89 93
90 94