]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
NFS: abort nfs_atomic_open_v23 if name is too long.
authorNeilBrown <neilb@suse.de>
Tue, 28 May 2024 23:11:36 +0000 (09:11 +1000)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Thu, 30 May 2024 20:12:11 +0000 (16:12 -0400)
An attempt to open a file with a name longer than NFS3_MAXNAMLEN will
trigger a WARN_ON_ONCE in encode_filename3() because
nfs_atomic_open_v23() doesn't have the test on ->d_name.len that
nfs_atomic_open() has.

So add that test.

Reported-by: James Clark <james.clark@arm.com>
Closes: https://lore.kernel.org/all/20240528105249.69200-1-james.clark@arm.com/
Fixes: 7c6c5249f061 ("NFS: add atomic_open for NFSv3 to handle O_TRUNC correctly.")
Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/dir.c

index 788077a4feb9a6412ec15c74415e0cdf0d260cb0..2b68a14982c8f4c80e1e69ef9ee3e8fee2cf3aca 100644 (file)
@@ -2254,6 +2254,9 @@ int nfs_atomic_open_v23(struct inode *dir, struct dentry *dentry,
         */
        int error = 0;
 
+       if (dentry->d_name.len > NFS_SERVER(dir)->namelen)
+               return -ENAMETOOLONG;
+
        if (open_flags & O_CREAT) {
                file->f_mode |= FMODE_CREATED;
                error = nfs_do_create(dir, dentry, mode, open_flags);