Skip to content

Commit

Permalink
BACKPORT: fs/namespace.c path_umount https://elixir.bootlin.com/linux…
Browse files Browse the repository at this point in the history
  • Loading branch information
OnlyTomInSecond authored and reocat committed Mar 30, 2024
1 parent 193b5d3 commit b46992c
Showing 1 changed file with 34 additions and 0 deletions.
34 changes: 34 additions & 0 deletions fs/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1695,6 +1695,40 @@ static inline bool may_mandlock(void)
return capable(CAP_SYS_ADMIN);
}

static int can_umount(const struct path *path, int flags)
{
struct mount *mnt = real_mount(path->mnt);

if (flags & ~(MNT_FORCE | MNT_DETACH | MNT_EXPIRE | UMOUNT_NOFOLLOW))
return -EINVAL;
if (!may_mount())
return -EPERM;
if (path->dentry != path->mnt->mnt_root)
return -EINVAL;
if (!check_mnt(mnt))
return -EINVAL;
if (mnt->mnt.mnt_flags & MNT_LOCKED) /* Check optimistically */
return -EINVAL;
if (flags & MNT_FORCE && !capable(CAP_SYS_ADMIN))
return -EPERM;
return 0;
}

int path_umount(struct path *path, int flags)
{
struct mount *mnt = real_mount(path->mnt);
int ret;

ret = can_umount(path, flags);
if (!ret)
ret = do_umount(mnt, flags);

/* we mustn't call path_put() as that would clear mnt_expiry_mark */
dput(path->dentry);
mntput_no_expire(mnt);
return ret;
}

/*
* Now umount can handle mount points as well as block devices.
* This is important for filesystems which use unnamed block devices.
Expand Down

0 comments on commit b46992c

Please sign in to comment.