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 kernel/seccomp.c (1 of 36 files). Show all

Unified · Split

kernel/seccomp.c+2−2

@@ -71,7 +71,7 @@ static void populate_seccomp_data(struct seccomp_data *sd) · 70 unmodified lines
71	71	struct pt_regs *regs = task_pt_regs(task);
72	72
73	73	sd->nr = syscall_get_nr(task, regs);
74		− sd->arch = syscall_get_arch(task, regs);
	74	+ sd->arch = syscall_get_arch();
75	75
76	76	/* Unroll syscall_get_args to help gcc on arm. */
77	77	syscall_get_arguments(task, regs, 0, 1, (unsigned long *) &sd->args[0]);
@@ -348,7 +348,7 @@ static void seccomp_send_sigsys(int syscall, int reason) · 270 unmodified lines
348	348	info.si_code = SYS_SECCOMP;
349	349	info.si_call_addr = (void __user *)KSTK_EIP(current);
350	350	info.si_errno = reason;
351		− info.si_arch = syscall_get_arch(current, task_pt_regs(current));
	351	+ info.si_arch = syscall_get_arch();
352	352	info.si_syscall = syscall;
353	353	force_sig_info(SIGSYS, &info, current);
354	354	}