aboutsummaryrefslogtreecommitdiffstats
path: root/arch/tile/kernel
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@ezchip.com>2015-07-22 14:30:14 -0400
committerChris Metcalf <cmetcalf@ezchip.com>2015-07-30 12:32:16 -0400
commita0ddef81f4aeeeec3326f6b6a255d8ea13b41908 (patch)
tree3a551abb0a57ff62fa7ad380f87e6c8bdb154d7b /arch/tile/kernel
parent38715df206d52817ac8ac032f35ee76955bdc15d (diff)
tile: enable full SECCOMP support
Signed-off-by: Chris Metcalf <cmetcalf@ezchip.com>
Diffstat (limited to 'arch/tile/kernel')
-rw-r--r--arch/tile/kernel/intvec_32.S1
-rw-r--r--arch/tile/kernel/intvec_64.S1
-rw-r--r--arch/tile/kernel/ptrace.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/tile/kernel/intvec_32.S b/arch/tile/kernel/intvec_32.S
index cdbda45a4e4b..fbbe2ea882ea 100644
--- a/arch/tile/kernel/intvec_32.S
+++ b/arch/tile/kernel/intvec_32.S
@@ -1224,6 +1224,7 @@ handle_syscall:
1224 jal do_syscall_trace_enter 1224 jal do_syscall_trace_enter
1225 } 1225 }
1226 FEEDBACK_REENTER(handle_syscall) 1226 FEEDBACK_REENTER(handle_syscall)
1227 blz r0, .Lsyscall_sigreturn_skip
1227 1228
1228 /* 1229 /*
1229 * We always reload our registers from the stack at this 1230 * We always reload our registers from the stack at this
diff --git a/arch/tile/kernel/intvec_64.S b/arch/tile/kernel/intvec_64.S
index 800b91d3f9dc..58964d209d4d 100644
--- a/arch/tile/kernel/intvec_64.S
+++ b/arch/tile/kernel/intvec_64.S
@@ -1247,6 +1247,7 @@ handle_syscall:
1247 jal do_syscall_trace_enter 1247 jal do_syscall_trace_enter
1248 } 1248 }
1249 FEEDBACK_REENTER(handle_syscall) 1249 FEEDBACK_REENTER(handle_syscall)
1250 bltz r0, .Lsyscall_sigreturn_skip
1250 1251
1251 /* 1252 /*
1252 * We always reload our registers from the stack at this 1253 * We always reload our registers from the stack at this
diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c
index f84eed8243da..bdc126faf741 100644
--- a/arch/tile/kernel/ptrace.c
+++ b/arch/tile/kernel/ptrace.c
@@ -262,6 +262,9 @@ int do_syscall_trace_enter(struct pt_regs *regs)
262 if (work & _TIF_NOHZ) 262 if (work & _TIF_NOHZ)
263 user_exit(); 263 user_exit();
264 264
265 if (secure_computing() == -1)
266 return -1;
267
265 if (work & _TIF_SYSCALL_TRACE) { 268 if (work & _TIF_SYSCALL_TRACE) {
266 if (tracehook_report_syscall_entry(regs)) 269 if (tracehook_report_syscall_entry(regs))
267 regs->regs[TREG_SYSCALL_NR] = -1; 270 regs->regs[TREG_SYSCALL_NR] = -1;