Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: MIPS: Enable ISA_DMA_API config to fix build failure MIPS: 32-bit: Fix build failure in asm/fcntl.h MIPS: Remove all generated vmlinuz* files on "make clean" MIPS: do_sigaltstack() expects userland pointers MIPS: Fix error values in case of bad_stack MIPS: Sanitize restart logics MIPS: secure_computing, syscall audit: syscall number should in r2, not r0. MIPS: Don't block signals if we'd failed to setup a sigframe
This commit is contained in:
@@ -93,8 +93,9 @@ NESTED(handle_sys, PT_SIZE, sp)
|
||||
sd t0, PT_R7(sp) # set error flag
|
||||
beqz t0, 1f
|
||||
|
||||
ld t1, PT_R2(sp) # syscall number
|
||||
dnegu v0 # error
|
||||
sd v0, PT_R0(sp) # flag for syscall restarting
|
||||
sd t1, PT_R0(sp) # save it for syscall restarting
|
||||
1: sd v0, PT_R2(sp) # result
|
||||
|
||||
o32_syscall_exit:
|
||||
@@ -142,8 +143,9 @@ trace_a_syscall:
|
||||
sd t0, PT_R7(sp) # set error flag
|
||||
beqz t0, 1f
|
||||
|
||||
ld t1, PT_R2(sp) # syscall number
|
||||
dnegu v0 # error
|
||||
sd v0, PT_R0(sp) # set flag for syscall restarting
|
||||
sd t1, PT_R0(sp) # save it for syscall restarting
|
||||
1: sd v0, PT_R2(sp) # result
|
||||
|
||||
j syscall_exit
|
||||
@@ -154,8 +156,7 @@ trace_a_syscall:
|
||||
* The stackpointer for a call with more than 4 arguments is bad.
|
||||
*/
|
||||
bad_stack:
|
||||
dnegu v0 # error
|
||||
sd v0, PT_R0(sp)
|
||||
li v0, EFAULT
|
||||
sd v0, PT_R2(sp)
|
||||
li t0, 1 # set error flag
|
||||
sd t0, PT_R7(sp)
|
||||
|
Reference in New Issue
Block a user