KernelSU-Next: backport path_umount
This commit is contained in:
@@ -77,6 +77,7 @@ extern int finish_automount(struct vfsmount *, struct path *);
|
|||||||
extern int sb_prepare_remount_readonly(struct super_block *);
|
extern int sb_prepare_remount_readonly(struct super_block *);
|
||||||
|
|
||||||
extern void __init mnt_init(void);
|
extern void __init mnt_init(void);
|
||||||
|
int path_umount(struct path *path, int flags);
|
||||||
|
|
||||||
extern int __mnt_want_write_file(struct file *);
|
extern int __mnt_want_write_file(struct file *);
|
||||||
extern void __mnt_drop_write_file(struct file *);
|
extern void __mnt_drop_write_file(struct file *);
|
||||||
|
|||||||
@@ -1645,6 +1645,40 @@ static inline bool may_mandlock(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
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.
|
* Now umount can handle mount points as well as block devices.
|
||||||
* This is important for filesystems which use unnamed block devices.
|
* This is important for filesystems which use unnamed block devices.
|
||||||
|
|||||||
Reference in New Issue
Block a user