Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Change-Id: I7c9d49079d4e18390c2d520513a4afd55e6eaa3e

Browse source
This commit is contained in:
Sasha Levitskiy 2012-11-13 10:14:51 -08:00 committed by Iliyan Malchev
parent 2d338c789a
commit b91885c38c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/Kconfig
View file

@ -82,7 +82,8 @@ config X86
select CLKEVT_I8253 select CLKEVT_I8253
select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_IOMAP select GENERIC_IOMAP
select DCACHE_WORD_ACCESS select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
select HAVE_ARCH_SECCOMP_FILTER
config INSTRUCTION_DECODER config INSTRUCTION_DECODER
def_bool (KPROBES || PERF_EVENTS) def_bool (KPROBES || PERF_EVENTS)

7
arch/x86/kernel/ptrace.c
View file

@ -1480,7 +1480,11 @@ long syscall_trace_enter(struct pt_regs *regs)
regs->flags |= X86_EFLAGS_TF; regs->flags |= X86_EFLAGS_TF;
/* do the secure computing check first */ /* do the secure computing check first */
secure_computing(regs->orig_ax); if (secure_computing(regs->orig_ax)) {
/* seccomp failures shouldn't expose any additional code. */
ret = -1L;
goto out;
}
if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))
ret = -1L; ret = -1L;
@ -1505,6 +1509,7 @@ long syscall_trace_enter(struct pt_regs *regs)
regs->dx, regs->r10); regs->dx, regs->r10);
#endif #endif
out:
return ret ?: regs->orig_ax; return ret ?: regs->orig_ax;
} }