diff options
| author |   Marc Dionne <marc.dionne@auristor.com> | 2025-03-25 09:59:05 -0300 |
|---|---|---|
| committer |   Christian Brauner <brauner@kernel.org> | 2025-03-25 14:59:14 +0100 |
| commit | 406fad7698f5bf21ab6b5ca195bf4b9e0b3990ed (patch) | |
| tree | 26b2514128c3d05d4f3eb3adc9b72f5d5cc09ac1 | |
| parent | exec: fix the racy usage of fs_struct->in_exec (diff) | |
| download | wireguard-linux-406fad7698f5bf21ab6b5ca195bf4b9e0b3990ed.tar.xz wireguard-linux-406fad7698f5bf21ab6b5ca195bf4b9e0b3990ed.zip | |
cachefiles: Fix oops in vfs_mkdir from cachefiles_get_directory
Commit c54b386969a5 ("VFS: Change vfs_mkdir() to return the dentry.")
changed cachefiles_get_directory, replacing "subdir" with a ERR_PTR
from the result of cachefiles_inject_write_error, which is either 0
or some error code. This causes an oops when the resulting pointer
is passed to vfs_mkdir.
Use a similar pattern to what is used earlier in the function; replace
subdir with either the return value from vfs_mkdir, or the ERR_PTR
of the cachefiles_inject_write_error() return value, but only if it
is non zero.
Fixes: c54b386969a5 ("VFS: Change vfs_mkdir() to return the dentry.")
cc: netfs@lists.linux.dev
Signed-off-by: Marc Dionne <marc.dionne@auristor.com>
Link: https://lore.kernel.org/r/20250325125905.395372-1-marc.dionne@auristor.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | fs/cachefiles/namei.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c index 83a60126de0f..14d0cc894000 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c @@ -128,10 +128,11 @@ retry: ret = security_path_mkdir(&path, subdir, 0700); if (ret < 0) goto mkdir_error; - subdir = ERR_PTR(cachefiles_inject_write_error()); - if (!IS_ERR(subdir)) + ret = cachefiles_inject_write_error(); + if (ret == 0) subdir = vfs_mkdir(&nop_mnt_idmap, d_inode(dir), subdir, 0700); - ret = PTR_ERR(subdir); + else + subdir = ERR_PTR(ret); if (IS_ERR(subdir)) { trace_cachefiles_vfs_error(NULL, d_inode(dir), ret, cachefiles_trace_mkdir_error); |