Commit 6c83658f authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds

[PATCH] ppc64: correct return code in syscall auditing

This patch is from David Woodhouse <dwmw2@infradead.org>.

We were pretending that every syscall returned zero. Don't do that.
Signed-Off-By: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8ac6e828
...@@ -231,6 +231,7 @@ syscall_dotrace: ...@@ -231,6 +231,7 @@ syscall_dotrace:
syscall_exit_trace: syscall_exit_trace:
std r3,GPR3(r1) std r3,GPR3(r1)
bl .save_nvgprs bl .save_nvgprs
addi r3,r1,STACK_FRAME_OVERHEAD
bl .do_syscall_trace_leave bl .do_syscall_trace_leave
REST_NVGPRS(r1) REST_NVGPRS(r1)
ld r3,GPR3(r1) ld r3,GPR3(r1)
...@@ -324,6 +325,7 @@ _GLOBAL(ppc64_rt_sigreturn) ...@@ -324,6 +325,7 @@ _GLOBAL(ppc64_rt_sigreturn)
ld r4,TI_FLAGS(r4) ld r4,TI_FLAGS(r4)
andi. r4,r4,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) andi. r4,r4,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP)
beq+ 81f beq+ 81f
addi r3,r1,STACK_FRAME_OVERHEAD
bl .do_syscall_trace_leave bl .do_syscall_trace_leave
81: b .ret_from_except 81: b .ret_from_except
......
...@@ -313,10 +313,10 @@ void do_syscall_trace_enter(struct pt_regs *regs) ...@@ -313,10 +313,10 @@ void do_syscall_trace_enter(struct pt_regs *regs)
do_syscall_trace(); do_syscall_trace();
} }
void do_syscall_trace_leave(void) void do_syscall_trace_leave(struct pt_regs *regs)
{ {
if (unlikely(current->audit_context)) if (unlikely(current->audit_context))
audit_syscall_exit(current, 0); /* FIXME: pass pt_regs */ audit_syscall_exit(current, regs->result);
if ((test_thread_flag(TIF_SYSCALL_TRACE) if ((test_thread_flag(TIF_SYSCALL_TRACE)
|| test_thread_flag(TIF_SINGLESTEP)) || test_thread_flag(TIF_SINGLESTEP))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment