bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-05 23:05:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

do_new_mount_fc(): use __free() to deal with dropping mnt on failure

Browse Source 
do_add_mount() consumes vfsmount on success; just follow it with
conditional retain_and_null_ptr() on success and we can switch
to __free() for mnt and be done with that - unlock_mount() is
in the very end.

Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2025-08-21 22:43:32 -04:00
parent 9bf5d48852
commit 308a022f41
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/namespace.c
View File

@@ -3696,7 +3696,7 @@ static int do_new_mount_fc(struct fs_context *fc, struct path *mountpoint,
{
struct pinned_mountpoint mp = {};
struct super_block *sb;
struct vfsmount *mnt = fc_mount(fc);
struct vfsmount *mnt __free(mntput) = fc_mount(fc);
int error;
if (IS_ERR(mnt))
@@ -3704,10 +3704,11 @@ static int do_new_mount_fc(struct fs_context *fc, struct path *mountpoint,
sb = fc->root->d_sb;
error = security_sb_kern_mount(sb);
if (!error && mount_too_revealing(sb, &mnt_flags))
error = -EPERM;
if (unlikely(error))
goto out;
return error;
if (unlikely(mount_too_revealing(sb, &mnt_flags)))
return -EPERM;
mnt_warn_timestamp_expiry(mountpoint, mnt);
@@ -3716,11 +3717,9 @@ static int do_new_mount_fc(struct fs_context *fc, struct path *mountpoint,
error = do_add_mount(real_mount(mnt), mp.mp,
mountpoint, mnt_flags);
if (!error)
mnt = NULL; // consumed on success
retain_and_null_ptr(mnt); // consumed on success
unlock_mount(&mp);
}
out:
mntput(mnt);
return error;
}