]> www.infradead.org Git - users/hch/misc.git/commitdiff
fs: Fix filename init after recent refactoring
authorSong Liu <song@kernel.org>
Wed, 9 Apr 2025 22:05:34 +0000 (15:05 -0700)
committerChristian Brauner <brauner@kernel.org>
Fri, 11 Apr 2025 14:00:35 +0000 (16:00 +0200)
getname_flags() should save __user pointer "filename" in filename->uptr.
However, this logic is broken by a recent refactoring. Fix it by passing
__user pointer filename to helper initname().

Fixes: 611851010c74 ("fs: dedup handling of struct filename init and refcounts bumps")
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: Christian Brauner <brauner@kernel.org>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/20250409220534.3635801-1-song@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/namei.c

index 360a86ca1f0270ca34d6bd49cc46dfb8361e0b3b..8510ff53f12e588d7408a442b6705ddf909e1840 100644 (file)
 
 #define EMBEDDED_NAME_MAX      (PATH_MAX - offsetof(struct filename, iname))
 
-static inline void initname(struct filename *name)
+static inline void initname(struct filename *name, const char __user *uptr)
 {
-       name->uptr = NULL;
+       name->uptr = uptr;
        name->aname = NULL;
        atomic_set(&name->refcnt, 1);
 }
@@ -210,7 +210,7 @@ getname_flags(const char __user *filename, int flags)
                        return ERR_PTR(-ENAMETOOLONG);
                }
        }
-       initname(result);
+       initname(result, filename);
        audit_getname(result);
        return result;
 }
@@ -268,7 +268,7 @@ struct filename *getname_kernel(const char * filename)
                return ERR_PTR(-ENAMETOOLONG);
        }
        memcpy((char *)result->name, filename, len);
-       initname(result);
+       initname(result, NULL);
        audit_getname(result);
        return result;
 }