summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2025-11-01 00:48:31 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2026-01-13 15:16:44 -0500
commit592ab7fbb83ffe78378d7d25e15d8799d1f1df29 (patch)
treecaba0b4489346851386d226573a0cc5e52583052
parentb756d8ba831036ad5b385576d0bf20daf0beca7c (diff)
chdir(2): import pathname only once
Convert the user_path_at() call inside a retry loop into getname_flags() + filename_lookup() + putname() and leave only filename_lookup() inside the loop. In this case we never pass LOOKUP_EMPTY, so getname_flags() is equivalent to plain getname(). The things could be further simplified by use of cleanup.h stuff, but let's not clutter the patch with that. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/open.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c
index a2d775bec8c1..67c114bdeac5 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -555,8 +555,9 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
struct path path;
int error;
unsigned int lookup_flags = LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
+ struct filename *name = getname(filename);
retry:
- error = user_path_at(AT_FDCWD, filename, lookup_flags, &path);
+ error = filename_lookup(AT_FDCWD, name, lookup_flags, &path, NULL);
if (error)
goto out;
@@ -573,6 +574,7 @@ dput_and_out:
goto retry;
}
out:
+ putname(name);
return error;
}