From: Al Viro <viro@zeniv.linux.org.uk>
To: linux-fsdevel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
Mateusz Guzik <mjguzik@gmail.com>,
Paul Moore <paul@paul-moore.com>, Jens Axboe <axboe@kernel.dk>,
audit@vger.kernel.org, io-uring@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 16/68] ntfs: ->d_compare() must not block
Date: Wed, 14 Jan 2026 04:32:18 +0000 [thread overview]
Message-ID: <20260114043310.3885463-17-viro@zeniv.linux.org.uk> (raw)
In-Reply-To: <20260114043310.3885463-1-viro@zeniv.linux.org.uk>
... so don't use __getname() there. Switch it (and ntfs_d_hash(), while
we are at it) to kmalloc(PATH_MAX, GFP_NOWAIT). Yes, ntfs_d_hash()
almost certainly can do with smaller allocations, but let ntfs folks
deal with that - keep the allocation size as-is for now.
Stop abusing names_cachep in ntfs, period - various uses of that thing
in there have nothing to do with pathnames; just use k[mz]alloc() and
be done with that. For now let's keep sizes as-in, but AFAICS none of
the users actually want PATH_MAX.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/ntfs3/dir.c | 5 ++---
fs/ntfs3/fsntfs.c | 4 ++--
fs/ntfs3/inode.c | 13 ++++++-------
fs/ntfs3/namei.c | 17 ++++++++---------
fs/ntfs3/xattr.c | 5 ++---
5 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c
index b98e95d6b4d9..cf038d713f50 100644
--- a/fs/ntfs3/dir.c
+++ b/fs/ntfs3/dir.c
@@ -423,8 +423,7 @@ static int ntfs_readdir(struct file *file, struct dir_context *ctx)
if (!dir_emit_dots(file, ctx))
return 0;
- /* Allocate PATH_MAX bytes. */
- name = __getname();
+ name = kmalloc(PATH_MAX, GFP_KERNEL);
if (!name)
return -ENOMEM;
@@ -502,7 +501,7 @@ static int ntfs_readdir(struct file *file, struct dir_context *ctx)
out:
- __putname(name);
+ kfree(name);
put_indx_node(node);
if (err == 1) {
diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
index 5f138f715835..bd67ba7b5015 100644
--- a/fs/ntfs3/fsntfs.c
+++ b/fs/ntfs3/fsntfs.c
@@ -2627,7 +2627,7 @@ int ntfs_set_label(struct ntfs_sb_info *sbi, u8 *label, int len)
u32 uni_bytes;
struct ntfs_inode *ni = sbi->volume.ni;
/* Allocate PATH_MAX bytes. */
- struct cpu_str *uni = __getname();
+ struct cpu_str *uni = kmalloc(PATH_MAX, GFP_KERNEL);
if (!uni)
return -ENOMEM;
@@ -2671,6 +2671,6 @@ int ntfs_set_label(struct ntfs_sb_info *sbi, u8 *label, int len)
err = _ni_write_inode(&ni->vfs_inode, 0);
out:
- __putname(uni);
+ kfree(uni);
return err;
}
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 0a9ac5efeb67..edfb973e4e82 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -1281,7 +1281,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
fa |= FILE_ATTRIBUTE_READONLY;
/* Allocate PATH_MAX bytes. */
- new_de = kmem_cache_zalloc(names_cachep, GFP_KERNEL);
+ new_de = kzalloc(PATH_MAX, GFP_KERNEL);
if (!new_de) {
err = -ENOMEM;
goto out1;
@@ -1702,7 +1702,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
ntfs_mark_rec_free(sbi, ino, false);
out2:
- __putname(new_de);
+ kfree(new_de);
kfree(rp);
out1:
@@ -1723,7 +1723,7 @@ int ntfs_link_inode(struct inode *inode, struct dentry *dentry)
struct NTFS_DE *de;
/* Allocate PATH_MAX bytes. */
- de = kmem_cache_zalloc(names_cachep, GFP_KERNEL);
+ de = kzalloc(PATH_MAX, GFP_KERNEL);
if (!de)
return -ENOMEM;
@@ -1737,7 +1737,7 @@ int ntfs_link_inode(struct inode *inode, struct dentry *dentry)
err = ni_add_name(ntfs_i(d_inode(dentry->d_parent)), ni, de);
out:
- __putname(de);
+ kfree(de);
return err;
}
@@ -1760,8 +1760,7 @@ int ntfs_unlink_inode(struct inode *dir, const struct dentry *dentry)
if (ntfs_is_meta_file(sbi, ni->mi.rno))
return -EINVAL;
- /* Allocate PATH_MAX bytes. */
- de = kmem_cache_zalloc(names_cachep, GFP_KERNEL);
+ de = kzalloc(PATH_MAX, GFP_KERNEL);
if (!de)
return -ENOMEM;
@@ -1797,7 +1796,7 @@ int ntfs_unlink_inode(struct inode *dir, const struct dentry *dentry)
out:
ni_unlock(ni);
- __putname(de);
+ kfree(de);
return err;
}
diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
index 3b24ca02de61..b2af8f695e60 100644
--- a/fs/ntfs3/namei.c
+++ b/fs/ntfs3/namei.c
@@ -68,7 +68,7 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,
u32 flags)
{
struct ntfs_inode *ni = ntfs_i(dir);
- struct cpu_str *uni = __getname();
+ struct cpu_str *uni = kmalloc(PATH_MAX, GFP_KERNEL);
struct inode *inode;
int err;
@@ -85,7 +85,7 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,
inode = dir_search_u(dir, uni, NULL);
ni_unlock(ni);
}
- __putname(uni);
+ kfree(uni);
}
/*
@@ -303,8 +303,7 @@ static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir,
return err;
}
- /* Allocate PATH_MAX bytes. */
- de = __getname();
+ de = kmalloc(PATH_MAX, GFP_KERNEL);
if (!de)
return -ENOMEM;
@@ -349,7 +348,7 @@ static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir,
ni_unlock(ni);
ni_unlock(dir_ni);
out:
- __putname(de);
+ kfree(de);
return err;
}
@@ -407,7 +406,7 @@ static int ntfs_d_hash(const struct dentry *dentry, struct qstr *name)
/*
* Try slow way with current upcase table
*/
- uni = kmem_cache_alloc(names_cachep, GFP_NOWAIT);
+ uni = kmalloc(PATH_MAX, GFP_NOWAIT);
if (!uni)
return -ENOMEM;
@@ -429,7 +428,7 @@ static int ntfs_d_hash(const struct dentry *dentry, struct qstr *name)
err = 0;
out:
- kmem_cache_free(names_cachep, uni);
+ kfree(uni);
return err;
}
@@ -468,7 +467,7 @@ static int ntfs_d_compare(const struct dentry *dentry, unsigned int len1,
* Try slow way with current upcase table
*/
sbi = dentry->d_sb->s_fs_info;
- uni1 = __getname();
+ uni1 = kmalloc(PATH_MAX, GFP_NOWAIT);
if (!uni1)
return -ENOMEM;
@@ -498,7 +497,7 @@ static int ntfs_d_compare(const struct dentry *dentry, unsigned int len1,
ret = !ntfs_cmp_names_cpu(uni1, uni2, sbi->upcase, false) ? 0 : 1;
out:
- __putname(uni1);
+ kfree(uni1);
return ret;
}
diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c
index c93df55e98d0..f3bb2c41c000 100644
--- a/fs/ntfs3/xattr.c
+++ b/fs/ntfs3/xattr.c
@@ -556,8 +556,7 @@ struct posix_acl *ntfs_get_acl(struct mnt_idmap *idmap, struct dentry *dentry,
if (unlikely(is_bad_ni(ni)))
return ERR_PTR(-EINVAL);
- /* Allocate PATH_MAX bytes. */
- buf = __getname();
+ buf = kmalloc(PATH_MAX, GFP_KERNEL);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -588,7 +587,7 @@ struct posix_acl *ntfs_get_acl(struct mnt_idmap *idmap, struct dentry *dentry,
if (!IS_ERR(acl))
set_cached_acl(inode, type, acl);
- __putname(buf);
+ kfree(buf);
return acl;
}
--
2.47.3
next prev parent reply other threads:[~2026-01-14 4:31 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-14 4:32 [PATCH v5 00/68] struct filename series Al Viro
2026-01-14 4:32 ` [PATCH v5 01/68] init_mknod(): turn into a trivial wrapper for do_mknodat() Al Viro
2026-01-14 4:32 ` [PATCH v5 02/68] init_mkdir(): turn into a trivial wrapper for do_mkdirat() Al Viro
2026-01-14 4:32 ` [PATCH v5 03/68] init_symlink(): turn into a trivial wrapper for do_symlinkat() Al Viro
2026-01-14 4:32 ` [PATCH v5 04/68] init_link(): turn into a trivial wrapper for do_linkat() Al Viro
2026-01-14 4:32 ` [PATCH v5 05/68] allow to use CLASS() for struct filename * Al Viro
2026-01-14 4:32 ` [PATCH v5 06/68] do_faccessat(): import pathname only once Al Viro
2026-01-14 4:32 ` [PATCH v5 07/68] do_fchmodat(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 08/68] do_fchownat(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 09/68] do_utimes_path(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 10/68] chdir(2): " Al Viro
2026-01-14 4:32 ` [PATCH v5 11/68] chroot(2): " Al Viro
2026-01-14 4:32 ` [PATCH v5 12/68] user_statfs(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 13/68] do_sys_truncate(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 14/68] do_readlinkat(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 15/68] get rid of audit_reusename() Al Viro
2026-01-14 4:32 ` Al Viro [this message]
2026-01-14 4:32 ` [PATCH v5 17/68] getname_flags() massage, part 1 Al Viro
2026-01-14 4:32 ` [PATCH v5 18/68] getname_flags() massage, part 2 Al Viro
2026-01-14 4:32 ` [PATCH v5 19/68] struct filename: use names_cachep only for getname() and friends Al Viro
2026-01-14 4:32 ` [PATCH v5 20/68] struct filename: saner handling of long names Al Viro
2026-01-14 4:32 ` [PATCH v5 21/68] fs: hide names_cache behind runtime const machinery Al Viro
2026-01-14 4:32 ` [PATCH v5 22/68] switch __getname_maybe_null() to CLASS(filename_flags) Al Viro
2026-01-14 4:32 ` [PATCH v5 23/68] allow incomplete imports of filenames Al Viro
2026-01-14 4:32 ` [PATCH v5 24/68] struct filename ->refcnt doesn't need to be atomic Al Viro
2026-01-14 4:32 ` [PATCH v5 25/68] file_getattr(): filename_lookup() accepts ERR_PTR() as filename Al Viro
2026-01-14 4:32 ` [PATCH v5 26/68] file_setattr(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 27/68] move_mount(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 28/68] ksmbd_vfs_path_lookup(): vfs_path_parent_lookup() accepts ERR_PTR() as name Al Viro
2026-01-14 4:32 ` [PATCH v5 29/68] ksmbd_vfs_rename(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 30/68] do_filp_open(): DTRT when getting ERR_PTR() as pathname Al Viro
2026-01-14 4:32 ` [PATCH v5 31/68] rename do_filp_open() to do_file_open() Al Viro
2026-01-14 4:32 ` [PATCH v5 32/68] do_sys_openat2(): get rid of useless check, switch to CLASS(filename) Al Viro
2026-01-14 4:32 ` [PATCH v5 33/68] simplify the callers of file_open_name() Al Viro
2026-01-14 4:32 ` [PATCH v5 34/68] simplify the callers of do_open_execat() Al Viro
2026-01-14 4:32 ` [PATCH v5 35/68] simplify the callers of alloc_bprm() Al Viro
2026-01-14 4:32 ` [PATCH v5 36/68] execve: fold {compat_,}do_execve{,at}() into their sole callers Al Viro
2026-01-14 4:32 ` [PATCH v5 37/68] do_execveat_common(): don't consume filename reference Al Viro
2026-01-14 4:32 ` [PATCH v5 38/68] switch {alloc,free}_bprm() to CLASS() Al Viro
2026-01-14 4:32 ` [PATCH v5 39/68] non-consuming variant of do_renameat2() Al Viro
2026-01-14 4:32 ` [PATCH v5 40/68] non-consuming variant of do_linkat() Al Viro
2026-01-14 4:32 ` [PATCH v5 41/68] non-consuming variant of do_symlinkat() Al Viro
2026-01-14 4:32 ` [PATCH v5 42/68] non-consuming variant of do_mkdirat() Al Viro
2026-01-14 4:32 ` [PATCH v5 43/68] non-consuming variant of do_mknodat() Al Viro
2026-01-14 4:32 ` [PATCH v5 44/68] non-consuming variants of do_{unlinkat,rmdir}() Al Viro
2026-01-14 4:32 ` [PATCH v5 45/68] file_[gs]etattr(2): switch to CLASS(filename_maybe_null) Al Viro
2026-01-14 4:32 ` [PATCH v5 46/68] mount_setattr(2): don't mess with LOOKUP_EMPTY Al Viro
2026-01-14 4:32 ` [PATCH v5 47/68] do_open_execat(): don't care about LOOKUP_EMPTY Al Viro
2026-01-14 4:32 ` [PATCH v5 48/68] vfs_open_tree(): use CLASS(filename_uflags) Al Viro
2026-01-14 4:32 ` [PATCH v5 49/68] name_to_handle_at(): " Al Viro
2026-01-14 4:32 ` [PATCH v5 50/68] fspick(2): use CLASS(filename_flags) Al Viro
2026-01-14 4:32 ` [PATCH v5 51/68] do_fchownat(): unspaghettify a bit Al Viro
2026-01-14 4:32 ` [PATCH v5 52/68] chdir(2): " Al Viro
2026-01-14 4:32 ` [PATCH v5 53/68] do_utimes_path(): switch to CLASS(filename_uflags) Al Viro
2026-01-14 4:32 ` [PATCH v5 54/68] do_sys_truncate(): switch to CLASS(filename) Al Viro
2026-01-14 4:32 ` [PATCH v5 55/68] do_readlinkat(): switch to CLASS(filename_flags) Al Viro
2026-01-14 4:32 ` [PATCH v5 56/68] do_f{chmod,chown,access}at(): use CLASS(filename_uflags) Al Viro
2026-01-14 4:32 ` [PATCH v5 57/68] namei.c: convert getname_kernel() callers to CLASS(filename_kernel) Al Viro
2026-01-14 4:33 ` [PATCH v5 58/68] namei.c: switch user pathname imports to CLASS(filename{,_flags}) Al Viro
2026-01-14 4:33 ` [PATCH v5 59/68] filename_...xattr(): don't consume filename reference Al Viro
2026-01-14 4:33 ` [PATCH v5 60/68] move_mount(2): switch to CLASS(filename_maybe_null) Al Viro
2026-01-14 4:33 ` [PATCH v5 61/68] chroot(2): switch to CLASS(filename) Al Viro
2026-01-14 4:33 ` [PATCH v5 62/68] quotactl_block(): " Al Viro
2026-01-14 4:33 ` [PATCH v5 63/68] statx: switch to CLASS(filename_maybe_null) Al Viro
2026-01-14 4:33 ` [PATCH v5 64/68] user_statfs(): switch to CLASS(filename) Al Viro
2026-01-14 4:33 ` [PATCH v5 65/68] mqueue: " Al Viro
2026-01-14 4:33 ` [PATCH v5 66/68] ksmbd: use CLASS(filename_kernel) Al Viro
2026-01-14 4:33 ` [PATCH v5 67/68] alpha: switch osf_mount() to strndup_user() Al Viro
2026-01-14 4:33 ` [PATCH v5 68/68] sysfs(2): fs_index() argument is _not_ a pathname Al Viro
2026-01-14 10:41 ` David Laight
2026-01-14 14:35 ` Al Viro
2026-01-14 16:51 ` David Laight
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260114043310.3885463-17-viro@zeniv.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=audit@vger.kernel.org \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=io-uring@vger.kernel.org \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjguzik@gmail.com \
--cc=paul@paul-moore.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox