Commit fefad9ef authored by Christian Brauner's avatar Christian Brauner Committed by Kees Cook
Browse files

seccomp: simplify secure_computing() 

Afaict, the struct seccomp_data argument to secure_computing() is unused
by all current callers. So let's remove it.
The argument was added in [1]. It was added because having the arch
supply the syscall arguments used to be faster than having it done by
secure_computing() (cf. Andy's comment in [2]). This is not true anymore
though.

/* References */
[1]: 2f275de5 ("seccomp: Add a seccomp_data parameter secure_computing()")
[2]: https://lore.kernel.org/r/CALCETrU_fs_At-hTpr231kpaAd0z7xJN4ku-DvzhRU6cvcJA_w@mail.gmail.com



Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Drewry <wad@chromium.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-parisc@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux-um@lists.infradead.org
Cc: x86@kernel.org
Acked-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20190924064420.6353-1-christian.brauner@ubuntu.com


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 0eebfed2

arch/arm/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno) 


	/* Do seccomp after ptrace; syscall may have changed. */

#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER

	if (secure_computing(NULL) == -1)

	if (secure_computing() == -1)

		return -1;

#else

	/* XXX: remove this once OABI gets fixed */

arch/arm64/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ int syscall_trace_enter(struct pt_regs *regs) 
	}



	/* Do the secure computing after ptrace; failures should be fast. */

	if (secure_computing(NULL) == -1)

	if (secure_computing() == -1)

		return -1;



	if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))

arch/parisc/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ long do_syscall_trace_enter(struct pt_regs *regs) 
	}



	/* Do the secure computing check after ptrace. */

	if (secure_computing(NULL) == -1)

	if (secure_computing() == -1)

		return -1;



#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS

arch/s390/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) 
	}



	/* Do the secure computing check after ptrace. */

	if (secure_computing(NULL)) {

	if (secure_computing()) {

		/* seccomp failures shouldn't expose any additional code. */

		return -1;

	}

arch/um/kernel/skas/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ void handle_syscall(struct uml_pt_regs *r) 
		goto out;



	/* Do the seccomp check after ptrace; failures should be fast. */

	if (secure_computing(NULL) == -1)

	if (secure_computing() == -1)

		goto out;



	syscall = UPT_SYSCALL_NR(r);

CRA Git | Maintained and supported by SUSTech CRA and CCSE