[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251216035518.4037331-31-viro@zeniv.linux.org.uk>
Date: Tue, 16 Dec 2025 03:54:49 +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 v3 30/59] simplify the callers of alloc_bprm()
alloc_bprm() starts with do_open_execat() and it will do the right
thing if given ERR_PTR() for name. Allows to drop such checks in
its callers...
Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
fs/exec.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/fs/exec.c b/fs/exec.c
index 5b4110c7522e..1473e8c06a8c 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1782,9 +1782,6 @@ static int do_execveat_common(int fd, struct filename *filename,
struct linux_binprm *bprm;
int retval;
- if (IS_ERR(filename))
- return PTR_ERR(filename);
-
/*
* We move the actual failure in case of RLIMIT_NPROC excess from
* set*uid() to execve() because too many poorly written programs
@@ -1862,7 +1859,6 @@ static int do_execveat_common(int fd, struct filename *filename,
int kernel_execve(const char *kernel_filename,
const char *const *argv, const char *const *envp)
{
- struct filename *filename;
struct linux_binprm *bprm;
int fd = AT_FDCWD;
int retval;
@@ -1871,15 +1867,10 @@ int kernel_execve(const char *kernel_filename,
if (WARN_ON_ONCE(current->flags & PF_KTHREAD))
return -EINVAL;
- filename = getname_kernel(kernel_filename);
- if (IS_ERR(filename))
- return PTR_ERR(filename);
-
+ CLASS(filename_kernel, filename)(kernel_filename);
bprm = alloc_bprm(fd, filename, 0);
- if (IS_ERR(bprm)) {
- retval = PTR_ERR(bprm);
- goto out_ret;
- }
+ if (IS_ERR(bprm))
+ return PTR_ERR(bprm);
retval = count_strings_kernel(argv);
if (WARN_ON_ONCE(retval == 0))
@@ -1913,8 +1904,6 @@ int kernel_execve(const char *kernel_filename,
retval = bprm_execve(bprm);
out_free:
free_bprm(bprm);
-out_ret:
- putname(filename);
return retval;
}
--
2.47.3
Powered by blists - more mailing lists