Эх сурвалжийг харах

arm64: Do not invoke audit_syscall_* functions if !CONFIG_AUDIT_SYSCALL

This is a temporary patch to be able to compile the kernel in linux-next
where the audit_syscall_* API has been changed. To be reverted once the
proper arm64 fix can be applied.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Catalin Marinas 11 жил өмнө
parent
commit
2a8f45b040

+ 4 - 0
arch/arm64/kernel/ptrace.c

@@ -1115,15 +1115,19 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
 	if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
 	if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
 		trace_sys_enter(regs, regs->syscallno);
 		trace_sys_enter(regs, regs->syscallno);
 
 
+#ifdef CONFIG_AUDITSYSCALL
 	audit_syscall_entry(syscall_get_arch(), regs->syscallno,
 	audit_syscall_entry(syscall_get_arch(), regs->syscallno,
 		regs->orig_x0, regs->regs[1], regs->regs[2], regs->regs[3]);
 		regs->orig_x0, regs->regs[1], regs->regs[2], regs->regs[3]);
+#endif
 
 
 	return regs->syscallno;
 	return regs->syscallno;
 }
 }
 
 
 asmlinkage void syscall_trace_exit(struct pt_regs *regs)
 asmlinkage void syscall_trace_exit(struct pt_regs *regs)
 {
 {
+#ifdef CONFIG_AUDITSYSCALL
 	audit_syscall_exit(regs);
 	audit_syscall_exit(regs);
+#endif
 
 
 	if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
 	if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
 		trace_sys_exit(regs, regs_return_value(regs));
 		trace_sys_exit(regs, regs_return_value(regs));