Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44b37507 authored by Will Deacon's avatar Will Deacon
Browse files

Revert "arm64: Do not invoke audit_syscall_* functions if !CONFIG_AUDIT_SYSCALL" 



For some reason, the audit patches didn't make it out of -next this
merge window, so revert our temporary hack and let the audit guys deal
with fixing up -next.

This reverts commit 2a8f45b0.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 07a15dd5

arch/arm64/kernel/ptrace.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -1115,19 +1115,15 @@ 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));