[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20260108074201.435280-9-viro@zeniv.linux.org.uk>
Date: Thu, 8 Jan 2026 07:42:01 +0000
From: Al Viro <viro@...iv.linux.org.uk>
To: linux-fsdevel@...r.kernel.org
Cc: torvalds@...ux-foundation.org,
brauner@...nel.org,
jack@...e.cz,
mjguzik@...il.com,
paul@...l-moore.com,
axboe@...nel.dk,
audit@...r.kernel.org,
io-uring@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [RFC PATCH 8/8] do_execveat_common(): don't consume filename reference
... and convert its callers to CLASS(filename...)
Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
fs/exec.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/fs/exec.c b/fs/exec.c
index 4e192d7b7e71..3405c754da80 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1775,12 +1775,11 @@ static int bprm_execve(struct linux_binprm *bprm)
return retval;
}
-static int do_execveat_common(int fd, struct filename *__filename,
+static int do_execveat_common(int fd, struct filename *filename,
struct user_arg_ptr argv,
struct user_arg_ptr envp,
int flags)
{
- CLASS(filename_consume, filename)(__filename);
int retval;
/*
@@ -1927,7 +1926,8 @@ SYSCALL_DEFINE3(execve,
const char __user *const __user *, argv,
const char __user *const __user *, envp)
{
- return do_execveat_common(AT_FDCWD, getname(filename),
+ CLASS(filename, name)(filename);
+ return do_execveat_common(AT_FDCWD, name,
native_arg(argv), native_arg(envp), 0);
}
@@ -1937,7 +1937,8 @@ SYSCALL_DEFINE5(execveat,
const char __user *const __user *, envp,
int, flags)
{
- return do_execveat_common(fd, getname_uflags(filename, flags),
+ CLASS(filename_uflags, name)(filename, flags);
+ return do_execveat_common(fd, name,
native_arg(argv), native_arg(envp), flags);
}
@@ -1952,7 +1953,8 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
const compat_uptr_t __user *, argv,
const compat_uptr_t __user *, envp)
{
- return do_execveat_common(AT_FDCWD, getname(filename),
+ CLASS(filename, name)(filename);
+ return do_execveat_common(AT_FDCWD, name,
compat_arg(argv), compat_arg(envp), 0);
}
@@ -1962,7 +1964,8 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
const compat_uptr_t __user *, envp,
int, flags)
{
- return do_execveat_common(fd, getname_uflags(filename, flags),
+ CLASS(filename_uflags, name)(filename, flags);
+ return do_execveat_common(fd, name,
compat_arg(argv), compat_arg(envp), flags);
}
#endif
--
2.47.3
Powered by blists - more mailing lists