Darkangeel_hd
/
lineage_android_kernel_samsung_jf
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_samsung_jf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "CHROMIUM: arch/arm: move secure_computing into trace; respect return code" 

This reverts commit a651024793.

Change-Id: Ic21913b9ca930244de4cc52f5bbc2939793bcae7
This commit is contained in:
Dan Pasanen 2015-08-25 21:32:11 -05:00
parent a6482c35aa
commit a25e94221e
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/kernel/entry-common.S
View File

@ -452,7 +452,12 @@ ENTRY(vector_swi)
#ifdef CONFIG_SECCOMP #ifdef CONFIG_SECCOMP
tst r10, #_TIF_SECCOMP tst r10, #_TIF_SECCOMP
bne __sys_trace beq 1f
mov r0, scno
bl __secure_computing
add r0, sp, #S_R0 + S_OFF @ pointer to regs
ldmia r0, {r0 - r3} @ have to reload r0 - r3
1:
#endif #endif
tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls? tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls?

13
arch/arm/kernel/ptrace.c
View File

@ -910,16 +910,12 @@ long arch_ptrace(struct task_struct *child, long request,
asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno) asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
{ {
unsigned long ip; unsigned long ip;
current_thread_info()->syscall = scno;
if (why) if (why)
audit_syscall_exit(regs); audit_syscall_exit(regs);
else { else
if (secure_computing(scno) == -1)
return -1;
audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0, audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0,
regs->ARM_r1, regs->ARM_r2, regs->ARM_r3); regs->ARM_r1, regs->ARM_r2, regs->ARM_r3);
}
if (why == 0 && test_and_clear_thread_flag(TIF_SYSCALL_RESTARTSYS)) if (why == 0 && test_and_clear_thread_flag(TIF_SYSCALL_RESTARTSYS))
scno = __NR_restart_syscall - __NR_SYSCALL_BASE; scno = __NR_restart_syscall - __NR_SYSCALL_BASE;
@ -928,12 +924,7 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
if (!(current->ptrace & PT_PTRACED)) if (!(current->ptrace & PT_PTRACED))
return scno; return scno;
/* current_thread_info()->syscall = scno;
* IP is used to denote syscall entry/exit:
* IP = 0 -> entry, =1 -> exit
*/
ip = regs->ARM_ip;
regs->ARM_ip = why;
/* /*
* IP is used to denote syscall entry/exit: * IP is used to denote syscall entry/exit: