diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2014-07-24 09:12:11 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-07-24 11:01:17 -0400 |
commit | 2a8f45b040bcb9b2ad2845f061499d1b6f41cc7b (patch) | |
tree | c572d4786682bae3dcbd288fe1c743c109621e2e | |
parent | 7f0b1bf04511348995d6fce38c87c98a3b5cb781 (diff) |
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>
-rw-r--r-- | arch/arm64/kernel/ptrace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 70526cfda056..0310811bd77d 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c | |||
@@ -1115,15 +1115,19 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) | |||
1115 | if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) | 1115 | if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) |
1116 | trace_sys_enter(regs, regs->syscallno); | 1116 | trace_sys_enter(regs, regs->syscallno); |
1117 | 1117 | ||
1118 | #ifdef CONFIG_AUDITSYSCALL | ||
1118 | audit_syscall_entry(syscall_get_arch(), regs->syscallno, | 1119 | audit_syscall_entry(syscall_get_arch(), regs->syscallno, |
1119 | regs->orig_x0, regs->regs[1], regs->regs[2], regs->regs[3]); | 1120 | regs->orig_x0, regs->regs[1], regs->regs[2], regs->regs[3]); |
1121 | #endif | ||
1120 | 1122 | ||
1121 | return regs->syscallno; | 1123 | return regs->syscallno; |
1122 | } | 1124 | } |
1123 | 1125 | ||
1124 | asmlinkage void syscall_trace_exit(struct pt_regs *regs) | 1126 | asmlinkage void syscall_trace_exit(struct pt_regs *regs) |
1125 | { | 1127 | { |
1128 | #ifdef CONFIG_AUDITSYSCALL | ||
1126 | audit_syscall_exit(regs); | 1129 | audit_syscall_exit(regs); |
1130 | #endif | ||
1127 | 1131 | ||
1128 | if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) | 1132 | if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) |
1129 | trace_sys_exit(regs, regs_return_value(regs)); | 1133 | trace_sys_exit(regs, regs_return_value(regs)); |