Skip to content

seccomp: remove the 'sd' argument from __secure_computing()

Oleg Nesterov linux-mips linuxppc-dev lkml 2 versions – Applied

Status from this message: Applied to for-next/seccomp, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest4 patches 2 repliesApplied
  2. v14 patches 7 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/4seccomp/mips: change syscall_trace_enter() to use secure_computing()arch/mips/kernel/ptrace.c+2 -180 replies
2/4seccomp: fix the __secure_computing() stub for !HAVE_ARCH_SECCOMP_FILTERinclude/linux/seccomp.h kernel/seccomp.c+12 -101 reply
3/4seccomp: remove the 'sd' argument from __secure_computing()arch/powerpc/kernel/ptrace/ptrace.c include/linux/seccomp.h kernel/entry/common.c +1 more+10 -120 replies
4/4seccomp: remove the 'sd' argument from __seccomp_filter()kernel/seccomp.c+8 -130 replies

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchThomas BogendoerferKees CookLinus Walleij
1/4A-b R-b
2/4R-b
3/4R-b
4/4R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v2 thread

Cover letter [PATCH v2 0/4] seccomp: remove the 'sd' argument from __secure_computing()

Hello,

Link to v1: https://lore.kernel.org/all/[email protected]/
Only 2/4 was changed, please see interdiff at the end.

I've included the acks I got on 1/4, 3/4, and 4/4 (thanks!).

Oleg.
---

 arch/mips/kernel/ptrace.c           | 20 ++-----------------
 arch/powerpc/kernel/ptrace/ptrace.c |  2 +-
 include/linux/seccomp.h             | 12 ++++--------
 kernel/entry/common.c               |  2 +-
 kernel/seccomp.c                    | 39 ++++++++++++++++++-------------------
 5 files changed, 27 insertions(+), 48 deletions(-)

-------------------------------------------------------------------------------

include/linux/seccomp.h +2 -2
index 6125baa96b76..9b959972bf4a 100644
@@ -22,8 +22,9 @@
 #include <linux/atomic.h>
 #include <asm/seccomp.h>
 
-#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
 extern int __secure_computing(void);
+
+#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
 static inline int secure_computing(void)
 {
 	if (unlikely(test_syscall_work(SECCOMP)))

@@ -32,7 +33,6 @@ static inline int secure_computing(void)
 }
 #else
 extern void secure_computing_strict(int this_syscall);
-static inline int __secure_computing(void) { return 0; }
 #endif
 
 extern long prctl_get_seccomp(void);
kernel/seccomp.c +9 -4
index 75e293d3c1a1..4bd2eb50f77b 100644
@@ -29,13 +29,11 @@
 #include <linux/syscalls.h>
 #include <linux/sysctl.h>
 
+#include <asm/syscall.h>
+
 /* Not exposed in headers: strictly internal use only. */
 #define SECCOMP_MODE_DEAD	(SECCOMP_MODE_FILTER + 1)
 
-#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
-#include <asm/syscall.h>
-#endif
-
 #ifdef CONFIG_SECCOMP_FILTER
 #include <linux/file.h>
 #include <linux/filter.h>

@@ -1062,6 +1060,13 @@ void secure_computing_strict(int this_syscall)
 	else
 		BUG();
 }
+int __secure_computing(void)
+{
+	int this_syscall = syscall_get_nr(current, current_pt_regs());
+
+	secure_computing_strict(this_syscall);
+	return 0;
+}
 #else
 
 #ifdef CONFIG_SECCOMP_FILTER

Read the cover letter in its thread