| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20260114043310.3885463-42-viro@zeniv.linux.org.uk>
Date: Wed, 14 Jan 2026 04:32:43 +0000
From: Al Viro <viro@...iv.linux.org.uk>
To: linux-fsdevel@...r.kernel.org
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Christian Brauner <brauner@...nel.org>,
Jan Kara <jack@...e.cz>,
Mateusz Guzik <mjguzik@...il.com>,
Paul Moore <paul@...l-moore.com>,
Jens Axboe <axboe@...nel.dk>,
audit@...r.kernel.org,
io-uring@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH v5 41/68] non-consuming variant of do_symlinkat()
similar to previous commit; replacement is filename_symlinkat()
Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
Documentation/filesystems/porting.rst | 6 +++---
fs/init.c | 5 +++--
fs/internal.h | 2 +-
fs/namei.c | 23 +++++++++++------------
io_uring/fs.c | 5 +++--
5 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst
index 8ecbc41d6d82..c44c351bc297 100644
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@ -1339,6 +1339,6 @@ in-tree filesystems have done).
**mandatory**
-do_{link,renameat2}() are gone; filename_{link,renameat2}() replaces those.
-The difference is that the former used to consume filename references;
-the latter do not.
+do_{link,symlink,renameat2}() are gone; filename_...() counterparts
+replace those. The difference is that the former used to consume
+filename references; the latter do not.
diff --git a/fs/init.c b/fs/init.c
index f46e54552931..a54ef750ffe3 100644
--- a/fs/init.c
+++ b/fs/init.c
@@ -152,8 +152,9 @@ int __init init_link(const char *oldname, const char *newname)
int __init init_symlink(const char *oldname, const char *newname)
{
- return do_symlinkat(getname_kernel(oldname), AT_FDCWD,
- getname_kernel(newname));
+ CLASS(filename_kernel, old)(oldname);
+ CLASS(filename_kernel, new)(newname);
+ return filename_symlinkat(old, AT_FDCWD, new);
}
int __init init_unlink(const char *pathname)
diff --git a/fs/internal.h b/fs/internal.h
index c9b70c2716d1..4a63b89c02d7 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -61,7 +61,7 @@ int filename_renameat2(int olddfd, struct filename *oldname, int newdfd,
struct filename *newname, unsigned int flags);
int do_mkdirat(int dfd, struct filename *name, umode_t mode);
int do_mknodat(int dfd, struct filename *name, umode_t mode, unsigned int dev);
-int do_symlinkat(struct filename *from, int newdfd, struct filename *to);
+int filename_symlinkat(struct filename *from, int newdfd, struct filename *to);
int filename_linkat(int olddfd, struct filename *old, int newdfd,
struct filename *new, int flags);
int vfs_tmpfile(struct mnt_idmap *idmap,
diff --git a/fs/namei.c b/fs/namei.c
index e5d494610c2c..c88ad27f66c7 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -5581,7 +5581,7 @@ int vfs_symlink(struct mnt_idmap *idmap, struct inode *dir,
}
EXPORT_SYMBOL(vfs_symlink);
-int do_symlinkat(struct filename *from, int newdfd, struct filename *to)
+int filename_symlinkat(struct filename *from, int newdfd, struct filename *to)
{
int error;
struct dentry *dentry;
@@ -5589,15 +5589,13 @@ int do_symlinkat(struct filename *from, int newdfd, struct filename *to)
unsigned int lookup_flags = 0;
struct delegated_inode delegated_inode = { };
- if (IS_ERR(from)) {
- error = PTR_ERR(from);
- goto out_putnames;
- }
+ if (IS_ERR(from))
+ return PTR_ERR(from);
+
retry:
dentry = filename_create(newdfd, to, &path, lookup_flags);
- error = PTR_ERR(dentry);
if (IS_ERR(dentry))
- goto out_putnames;
+ return PTR_ERR(dentry);
error = security_path_symlink(&path, dentry, from->name);
if (!error)
@@ -5613,21 +5611,22 @@ int do_symlinkat(struct filename *from, int newdfd, struct filename *to)
lookup_flags |= LOOKUP_REVAL;
goto retry;
}
-out_putnames:
- putname(to);
- putname(from);
return error;
}
SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
int, newdfd, const char __user *, newname)
{
- return do_symlinkat(getname(oldname), newdfd, getname(newname));
+ CLASS(filename, old)(oldname);
+ CLASS(filename, new)(newname);
+ return filename_symlinkat(old, newdfd, new);
}
SYSCALL_DEFINE2(symlink, const char __user *, oldname, const char __user *, newname)
{
- return do_symlinkat(getname(oldname), AT_FDCWD, getname(newname));
+ CLASS(filename, old)(oldname);
+ CLASS(filename, new)(newname);
+ return filename_symlinkat(old, AT_FDCWD, new);
}
/**
diff --git a/io_uring/fs.c b/io_uring/fs.c
index e39cd1ca1942..cd4d88d37795 100644
--- a/io_uring/fs.c
+++ b/io_uring/fs.c
@@ -233,12 +233,13 @@ int io_symlinkat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
int io_symlinkat(struct io_kiocb *req, unsigned int issue_flags)
{
struct io_link *sl = io_kiocb_to_cmd(req, struct io_link);
+ CLASS(filename_complete_delayed, old)(&sl->oldpath);
+ CLASS(filename_complete_delayed, new)(&sl->newpath);
int ret;
WARN_ON_ONCE(issue_flags & IO_URING_F_NONBLOCK);
- ret = do_symlinkat(complete_getname(&sl->oldpath), sl->new_dfd,
- complete_getname(&sl->newpath));
+ ret = filename_symlinkat(old, sl->new_dfd, new);
req->flags &= ~REQ_F_NEED_CLEANUP;
io_req_set_res(req, ret, 0);
--
2.47.3
Powered by blists - more mailing lists