Merge git://git.infradead.org/users/eparis/audit

Pull audit updates from Eric Paris. * git://git.infradead.org/users/eparis/audit: (28 commits) AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC audit: renumber AUDIT_FEATURE_CHANGE into the 1300 range audit: do not cast audit_rule_data pointers pointlesly AUDIT: Allow login in non-init namespaces audit: define audit_is_compat in kernel internal header kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c sched: declare pid_alive as inline audit: use uapi/linux/audit.h for AUDIT_ARCH declarations syscall_get_arch: remove useless function arguments audit: remove stray newline from audit_log_execve_info() audit_panic() call audit: remove stray newlines from audit_log_lost messages audit: include subject in login records audit: remove superfluous new- prefix in AUDIT_LOGIN messages audit: allow user processes to log from another PID namespace audit: anchor all pid references in the initial pid namespace audit: convert PPIDs to the inital PID namespace. pid: get pid_t ppid of task in init_pid_ns audit: rename the misleading audit_get_context() to audit_take_context() audit: Add generic compat syscall support audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL ...

Linus Torvalds committed 12 years ago

Commit 0b747172 parents b7e70ca 312103d36 files · +351 −119Browse files

Showing the changes to lib (4 of 36 files). Show all

Unified · Split

4 files

lib/Kconfig +9 −0
lib/Makefile +1 −0
lib/audit.c +14 −1
lib/compat_audit.c +50 −0

lib/Kconfig+9−0

@@ -182,6 +182,15 @@ config AUDIT_GENERIC · 181 unmodified lines
182	182	depends on AUDIT && !AUDIT_ARCH
183	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	194	config RANDOM32_SELFTEST
186	195	bool "PRNG perform self test on init"
187	196	default n

lib/Makefile+1−0

@@ -96,6 +96,7 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o · 95 unmodified lines
96	96	obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
97	97	obj-$(CONFIG_SMP) += percpu_counter.o
98	98	obj-$(CONFIG_AUDIT_GENERIC) += audit.o
	99	+obj-$(CONFIG_AUDIT_COMPAT_GENERIC) += compat_audit.o
99	100
100	101	obj-$(CONFIG_SWIOTLB) += swiotlb.o
101	102	obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o

lib/audit.c+14−1

@@ -30,11 +30,17 @@ static unsigned signal_class[] = { · 29 unmodified lines
30	30
31	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	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	44	switch(syscall) {
39	45	#ifdef __NR_open
40	46	case __NR_open:
@@ -57,6 +63,13 @@ int audit_classify_syscall(int abi, unsigned syscall) · 16 unmodified lines
57	63
58	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	73	audit_register_class(AUDIT_CLASS_WRITE, write_class);
61	74	audit_register_class(AUDIT_CLASS_READ, read_class);
62	75	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

lib/compat_audit.c+50−0

@@ -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	+}