dummy/linux-stable-mirror
1
0
Fork 1
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2025-04-19 20:58:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
After the previous changes 'sd' is always NULL.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Kees Cook <kees@kernel.org>
Link: https://lore.kernel.org/r/20250128150313.GA15336@redhat.com
Signed-off-by: Kees Cook <kees@kernel.org>
This commit is contained in:
Oleg Nesterov 2025-01-28 16:03:13 +01:00 committed by Kees Cook
parent b37778bec8
commit 1027cd8084
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/ptrace/ptrace.c
View File

@ -215,7 +215,7 @@ static int do_seccomp(struct pt_regs *regs)
* have already loaded -ENOSYS into r3, or seccomp has put
* something else in r3 (via SECCOMP_RET_ERRNO/TRACE).
*/
if (__secure_computing(NULL))
if (__secure_computing())
return -1;
/*

6
include/linux/seccomp.h
View File

@ -22,13 +22,13 @@
#include <linux/atomic.h>
#include <asm/seccomp.h>
extern int __secure_computing(const struct seccomp_data *sd);
extern int __secure_computing(void);
#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
static inline int secure_computing(void)
{
if (unlikely(test_syscall_work(SECCOMP)))
return __secure_computing(NULL);
return __secure_computing();
return 0;
}
#else
@ -54,7 +54,7 @@ static inline int secure_computing(void) { return 0; }
#else
static inline void secure_computing_strict(int this_syscall) { return; }
#endif
static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }
static inline int __secure_computing(void) { return 0; }
static inline long prctl_get_seccomp(void)
{

2
kernel/entry/common.c
View File

@ -49,7 +49,7 @@ long syscall_trace_enter(struct pt_regs *regs, long syscall,
/* Do seccomp after ptrace, to catch any tracer changes. */
if (work & SYSCALL_WORK_SECCOMP) {
ret = __secure_computing(NULL);
ret = __secure_computing();
if (ret == -1L)
return ret;
}

12
kernel/seccomp.c
View File

@ -1072,10 +1072,9 @@ void secure_computing_strict(int this_syscall)
else
BUG();
}
int __secure_computing(const struct seccomp_data *sd)
int __secure_computing(void)
{
int this_syscall = sd ? sd->nr :
syscall_get_nr(current, current_pt_regs());
int this_syscall = syscall_get_nr(current, current_pt_regs());
secure_computing_strict(this_syscall);
return 0;
@ -1365,7 +1364,7 @@ static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd,
}
#endif
int __secure_computing(const struct seccomp_data *sd)
int __secure_computing(void)
{
int mode = current->seccomp.mode;
int this_syscall;
@ -1374,15 +1373,14 @@ int __secure_computing(const struct seccomp_data *sd)
unlikely(current->ptrace & PT_SUSPEND_SECCOMP))
return 0;
this_syscall = sd ? sd->nr :
syscall_get_nr(current, current_pt_regs());
this_syscall = syscall_get_nr(current, current_pt_regs());
switch (mode) {
case SECCOMP_MODE_STRICT:
__secure_computing_strict(this_syscall); /* may call do_exit */
return 0;
case SECCOMP_MODE_FILTER:
return __seccomp_filter(this_syscall, sd, false);
return __seccomp_filter(this_syscall, NULL, false);
/* Surviving SECCOMP_RET_KILL_* must be proactively impossible. */
case SECCOMP_MODE_DEAD:
WARN_ON_ONCE(1);