[PATCH 4/4] exec: move the call to getname_flags into do_execveat
From: Christoph Hellwig <hch@lst.de>
Date: 2021-03-26 14:40:32
Also in:
linux-arch, linux-fsdevel, linux-mips, linux-s390, linuxppc-dev, lkml, sparclinux
Subsystem:
exec & binfmt api, elf, filesystems (vfs and infrastructure), the rest · Maintainers:
Kees Cook, Alexander Viro, Christian Brauner, Linus Torvalds
Remove the duplicated copying of the pathname into the common helper. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/exec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/exec.c b/fs/exec.c
index b34c1eb9e7ad8e..5c0dd8f85fe7b5 100644
--- a/fs/exec.c
+++ b/fs/exec.c@@ -1843,13 +1843,16 @@ static int bprm_execve(struct linux_binprm *bprm, return retval; } -static int do_execveat(int fd, struct filename *filename, +static int do_execveat(int fd, const char __user *pathname, const char __user *const __user *argv, const char __user *const __user *envp, int flags) { + int lookup_flags = (flags & AT_EMPTY_PATH) ? LOOKUP_EMPTY : 0; + struct filename *filename; struct linux_binprm *bprm; int retval; + filename = getname_flags(pathname, lookup_flags, NULL); if (IS_ERR(filename)) return PTR_ERR(filename);
@@ -1993,7 +1996,7 @@ SYSCALL_DEFINE3(execve, const char __user *const __user *, argv, const char __user *const __user *, envp) { - return do_execveat(AT_FDCWD, getname(filename), argv, envp, 0); + return do_execveat(AT_FDCWD, filename, argv, envp, 0); } SYSCALL_DEFINE5(execveat,
@@ -2002,9 +2005,5 @@ SYSCALL_DEFINE5(execveat, const char __user *const __user *, envp, int, flags) { - int lookup_flags = (flags & AT_EMPTY_PATH) ? LOOKUP_EMPTY : 0; - - return do_execveat(fd, - getname_flags(filename, lookup_flags, NULL), - argv, envp, flags); + return do_execveat(fd, filename, argv, envp, flags); }
--
2.30.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel