Skip to content

Commit

Permalink
fs: Backport path_umount for KernelSu
Browse files Browse the repository at this point in the history
  • Loading branch information
meloalfa159 committed Apr 6, 2024
1 parent a817ae8 commit a041f93
Showing 1 changed file with 46 additions and 0 deletions.
46 changes: 46 additions & 0 deletions fs/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1739,6 +1739,52 @@ static inline bool may_mandlock(void)
}
#endif

/**
* path_mounted - check whether path is mounted
* @path: path to check
*
* Determine whether @path refers to the root of a mount.
*
* Return: true if @path is the root of a mount, false if not.
*/
static inline bool path_mounted(const struct path *path)
{
return path->mnt->mnt_root == path->dentry;
}

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

if (!may_mount())
return -EPERM;
if (!path_mounted(path))
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;
}

// caller is responsible for flags being sane
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 a041f93

Please sign in to comment.