diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig | 9 | ||||
-rw-r--r-- | lib/Makefile | 1 | ||||
-rw-r--r-- | lib/audit.c | 15 | ||||
-rw-r--r-- | lib/compat_audit.c | 50 |
4 files changed, 74 insertions, 1 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 991c98bc4a3f..1e80cb3c77a9 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
@@ -182,6 +182,15 @@ config AUDIT_GENERIC | |||
182 | depends on AUDIT && !AUDIT_ARCH | 182 | depends on AUDIT && !AUDIT_ARCH |
183 | default y | 183 | default y |
184 | 184 | ||
185 | config AUDIT_ARCH_COMPAT_GENERIC | ||
186 | bool | ||
187 | default n | ||
188 | |||
189 | config AUDIT_COMPAT_GENERIC | ||
190 | bool | ||
191 | depends on AUDIT_GENERIC && AUDIT_ARCH_COMPAT_GENERIC && COMPAT | ||
192 | default y | ||
193 | |||
185 | config RANDOM32_SELFTEST | 194 | config RANDOM32_SELFTEST |
186 | bool "PRNG perform self test on init" | 195 | bool "PRNG perform self test on init" |
187 | default n | 196 | default n |
diff --git a/lib/Makefile b/lib/Makefile index a459c31e8c6b..972552b39cf5 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
@@ -93,6 +93,7 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o | |||
93 | obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o | 93 | obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o |
94 | obj-$(CONFIG_SMP) += percpu_counter.o | 94 | obj-$(CONFIG_SMP) += percpu_counter.o |
95 | obj-$(CONFIG_AUDIT_GENERIC) += audit.o | 95 | obj-$(CONFIG_AUDIT_GENERIC) += audit.o |
96 | obj-$(CONFIG_AUDIT_COMPAT_GENERIC) += compat_audit.o | ||
96 | 97 | ||
97 | obj-$(CONFIG_SWIOTLB) += swiotlb.o | 98 | obj-$(CONFIG_SWIOTLB) += swiotlb.o |
98 | obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o | 99 | obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o |
diff --git a/lib/audit.c b/lib/audit.c index 76bbed4a20e5..1d726a22565b 100644 --- a/lib/audit.c +++ b/lib/audit.c | |||
@@ -30,11 +30,17 @@ static unsigned signal_class[] = { | |||
30 | 30 | ||
31 | int audit_classify_arch(int arch) | 31 | int audit_classify_arch(int arch) |
32 | { | 32 | { |
33 | return 0; | 33 | if (audit_is_compat(arch)) |
34 | return 1; | ||
35 | else | ||
36 | return 0; | ||
34 | } | 37 | } |
35 | 38 | ||
36 | int audit_classify_syscall(int abi, unsigned syscall) | 39 | int audit_classify_syscall(int abi, unsigned syscall) |
37 | { | 40 | { |
41 | if (audit_is_compat(abi)) | ||
42 | return audit_classify_compat_syscall(abi, syscall); | ||
43 | |||
38 | switch(syscall) { | 44 | switch(syscall) { |
39 | #ifdef __NR_open | 45 | #ifdef __NR_open |
40 | case __NR_open: | 46 | case __NR_open: |
@@ -57,6 +63,13 @@ int audit_classify_syscall(int abi, unsigned syscall) | |||
57 | 63 | ||
58 | static int __init audit_classes_init(void) | 64 | static int __init audit_classes_init(void) |
59 | { | 65 | { |
66 | #ifdef CONFIG_AUDIT_COMPAT_GENERIC | ||
67 | audit_register_class(AUDIT_CLASS_WRITE_32, compat_write_class); | ||
68 | audit_register_class(AUDIT_CLASS_READ_32, compat_read_class); | ||
69 | audit_register_class(AUDIT_CLASS_DIR_WRITE_32, compat_dir_class); | ||
70 | audit_register_class(AUDIT_CLASS_CHATTR_32, compat_chattr_class); | ||
71 | audit_register_class(AUDIT_CLASS_SIGNAL_32, compat_signal_class); | ||
72 | #endif | ||
60 | audit_register_class(AUDIT_CLASS_WRITE, write_class); | 73 | audit_register_class(AUDIT_CLASS_WRITE, write_class); |
61 | audit_register_class(AUDIT_CLASS_READ, read_class); | 74 | audit_register_class(AUDIT_CLASS_READ, read_class); |
62 | audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); | 75 | audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); |
diff --git a/lib/compat_audit.c b/lib/compat_audit.c new file mode 100644 index 000000000000..873f75b640ab --- /dev/null +++ b/lib/compat_audit.c | |||
@@ -0,0 +1,50 @@ | |||
1 | #include <linux/init.h> | ||
2 | #include <linux/types.h> | ||
3 | #include <asm/unistd32.h> | ||
4 | |||
5 | unsigned compat_dir_class[] = { | ||
6 | #include <asm-generic/audit_dir_write.h> | ||
7 | ~0U | ||
8 | }; | ||
9 | |||
10 | unsigned compat_read_class[] = { | ||
11 | #include <asm-generic/audit_read.h> | ||
12 | ~0U | ||
13 | }; | ||
14 | |||
15 | unsigned compat_write_class[] = { | ||
16 | #include <asm-generic/audit_write.h> | ||
17 | ~0U | ||
18 | }; | ||
19 | |||
20 | unsigned compat_chattr_class[] = { | ||
21 | #include <asm-generic/audit_change_attr.h> | ||
22 | ~0U | ||
23 | }; | ||
24 | |||
25 | unsigned compat_signal_class[] = { | ||
26 | #include <asm-generic/audit_signal.h> | ||
27 | ~0U | ||
28 | }; | ||
29 | |||
30 | int audit_classify_compat_syscall(int abi, unsigned syscall) | ||
31 | { | ||
32 | switch (syscall) { | ||
33 | #ifdef __NR_open | ||
34 | case __NR_open: | ||
35 | return 2; | ||
36 | #endif | ||
37 | #ifdef __NR_openat | ||
38 | case __NR_openat: | ||
39 | return 3; | ||
40 | #endif | ||
41 | #ifdef __NR_socketcall | ||
42 | case __NR_socketcall: | ||
43 | return 4; | ||
44 | #endif | ||
45 | case __NR_execve: | ||
46 | return 5; | ||
47 | default: | ||
48 | return 1; | ||
49 | } | ||
50 | } | ||