Commit 2f275de5 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Kees Cook

seccomp: Add a seccomp_data parameter secure_computing()

Currently, if arch code wants to supply seccomp_data directly to
seccomp (which is generally much faster than having seccomp do it
using the syscall_get_xyz() API), it has to use the two-phase
seccomp hooks. Add it to the easy hooks, too.

Cc: linux-arch@vger.kernel.org
Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 58d0a862
...@@ -934,7 +934,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno) ...@@ -934,7 +934,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
/* Do the secure computing check first; failures should be fast. */ /* Do the secure computing check first; failures should be fast. */
#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
if (secure_computing() == -1) if (secure_computing(NULL) == -1)
return -1; return -1;
#else #else
/* XXX: remove this once OABI gets fixed */ /* XXX: remove this once OABI gets fixed */
......
...@@ -1247,7 +1247,7 @@ static void tracehook_report_syscall(struct pt_regs *regs, ...@@ -1247,7 +1247,7 @@ static void tracehook_report_syscall(struct pt_regs *regs,
asmlinkage int syscall_trace_enter(struct pt_regs *regs) asmlinkage int syscall_trace_enter(struct pt_regs *regs)
{ {
/* Do the secure computing check first; failures should be fast. */ /* Do the secure computing check first; failures should be fast. */
if (secure_computing() == -1) if (secure_computing(NULL) == -1)
return -1; return -1;
if (test_thread_flag(TIF_SYSCALL_TRACE)) if (test_thread_flag(TIF_SYSCALL_TRACE))
......
...@@ -893,7 +893,7 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall) ...@@ -893,7 +893,7 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
current_thread_info()->syscall = syscall; current_thread_info()->syscall = syscall;
if (secure_computing() == -1) if (secure_computing(NULL) == -1)
return -1; return -1;
if (test_thread_flag(TIF_SYSCALL_TRACE) && if (test_thread_flag(TIF_SYSCALL_TRACE) &&
......
...@@ -312,7 +312,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, ...@@ -312,7 +312,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
long do_syscall_trace_enter(struct pt_regs *regs) long do_syscall_trace_enter(struct pt_regs *regs)
{ {
/* Do the secure computing check first. */ /* Do the secure computing check first. */
if (secure_computing() == -1) if (secure_computing(NULL) == -1)
return -1; return -1;
if (test_thread_flag(TIF_SYSCALL_TRACE) && if (test_thread_flag(TIF_SYSCALL_TRACE) &&
......
...@@ -1783,7 +1783,7 @@ static int do_seccomp(struct pt_regs *regs) ...@@ -1783,7 +1783,7 @@ static int do_seccomp(struct pt_regs *regs)
* have already loaded -ENOSYS into r3, or seccomp has put * have already loaded -ENOSYS into r3, or seccomp has put
* something else in r3 (via SECCOMP_RET_ERRNO/TRACE). * something else in r3 (via SECCOMP_RET_ERRNO/TRACE).
*/ */
if (__secure_computing()) if (__secure_computing(NULL))
return -1; return -1;
/* /*
......
...@@ -824,7 +824,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) ...@@ -824,7 +824,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
long ret = 0; long ret = 0;
/* Do the secure computing check first. */ /* Do the secure computing check first. */
if (secure_computing()) { if (secure_computing(NULL)) {
/* seccomp failures shouldn't expose any additional code. */ /* seccomp failures shouldn't expose any additional code. */
ret = -1; ret = -1;
goto out; goto out;
......
...@@ -255,7 +255,7 @@ int do_syscall_trace_enter(struct pt_regs *regs) ...@@ -255,7 +255,7 @@ int do_syscall_trace_enter(struct pt_regs *regs)
{ {
u32 work = ACCESS_ONCE(current_thread_info()->flags); u32 work = ACCESS_ONCE(current_thread_info()->flags);
if (secure_computing() == -1) if (secure_computing(NULL) == -1)
return -1; return -1;
if (work & _TIF_SYSCALL_TRACE) { if (work & _TIF_SYSCALL_TRACE) {
......
...@@ -21,7 +21,7 @@ void handle_syscall(struct uml_pt_regs *r) ...@@ -21,7 +21,7 @@ void handle_syscall(struct uml_pt_regs *r)
PT_REGS_SET_SYSCALL_RETURN(regs, -ENOSYS); PT_REGS_SET_SYSCALL_RETURN(regs, -ENOSYS);
/* Do the secure computing check first; failures should be fast. */ /* Do the secure computing check first; failures should be fast. */
if (secure_computing() == -1) if (secure_computing(NULL) == -1)
return; return;
if (syscall_trace_enter(regs)) if (syscall_trace_enter(regs))
......
...@@ -207,7 +207,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) ...@@ -207,7 +207,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
*/ */
regs->orig_ax = syscall_nr; regs->orig_ax = syscall_nr;
regs->ax = -ENOSYS; regs->ax = -ENOSYS;
tmp = secure_computing(); tmp = secure_computing(NULL);
if ((!tmp && regs->orig_ax != syscall_nr) || regs->ip != address) { if ((!tmp && regs->orig_ax != syscall_nr) || regs->ip != address) {
warn_bad_vsyscall(KERN_DEBUG, regs, warn_bad_vsyscall(KERN_DEBUG, regs,
"seccomp tried to change syscall nr or ip"); "seccomp tried to change syscall nr or ip");
......
...@@ -28,11 +28,11 @@ struct seccomp { ...@@ -28,11 +28,11 @@ struct seccomp {
}; };
#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
extern int __secure_computing(void); extern int __secure_computing(const struct seccomp_data *sd);
static inline int secure_computing(void) static inline int secure_computing(const struct seccomp_data *sd)
{ {
if (unlikely(test_thread_flag(TIF_SECCOMP))) if (unlikely(test_thread_flag(TIF_SECCOMP)))
return __secure_computing(); return __secure_computing(sd);
return 0; return 0;
} }
...@@ -61,7 +61,7 @@ struct seccomp { }; ...@@ -61,7 +61,7 @@ struct seccomp { };
struct seccomp_filter { }; struct seccomp_filter { };
#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
static inline int secure_computing(void) { return 0; } static inline int secure_computing(struct seccomp_data *sd) { return 0; }
#else #else
static inline void secure_computing_strict(int this_syscall) { return; } static inline void secure_computing_strict(int this_syscall) { return; }
#endif #endif
......
...@@ -554,9 +554,9 @@ void secure_computing_strict(int this_syscall) ...@@ -554,9 +554,9 @@ void secure_computing_strict(int this_syscall)
BUG(); BUG();
} }
#else #else
int __secure_computing(void) int __secure_computing(const struct seccomp_data *sd)
{ {
u32 phase1_result = seccomp_phase1(NULL); u32 phase1_result = seccomp_phase1(sd);
if (likely(phase1_result == SECCOMP_PHASE1_OK)) if (likely(phase1_result == SECCOMP_PHASE1_OK))
return 0; return 0;
......
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