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

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

Browse Source 
same story as with do_new_mount_fc().

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:53:06 -04:00
parent 308a022f41
commit f1f486b841
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fs/namespace.c
View File

@@ -3801,8 +3801,9 @@ static int lock_mount_exact(const struct path *path,
return err;
}
int finish_automount(struct vfsmount *m, const struct path *path)
int finish_automount(struct vfsmount *__m, const struct path *path)
{
struct vfsmount *m __free(mntput) = __m;
struct pinned_mountpoint mp = {};
struct mount *mnt;
int err;
@@ -3814,10 +3815,8 @@ int finish_automount(struct vfsmount *m, const struct path *path)
mnt = real_mount(m);
if (m->mnt_root == path->dentry) {
err = -ELOOP;
goto discard;
}
if (m->mnt_root == path->dentry)
return -ELOOP;
/*
* we don't want to use lock_mount() - in this case finding something
@@ -3825,19 +3824,14 @@ int finish_automount(struct vfsmount *m, const struct path *path)
* got", not "try to mount it on top".
*/
err = lock_mount_exact(path, &mp);
if (unlikely(err)) {
mntput(m);
if (unlikely(err))
return err == -EBUSY ? 0 : err;
}
err = do_add_mount(mnt, mp.mp, path,
path->mnt->mnt_flags | MNT_SHRINKABLE);
if (likely(!err))
retain_and_null_ptr(m);
unlock_mount(&mp);
if (unlikely(err))
goto discard;
return 0;
discard:
mntput(m);
return err;
}