Home » Mailing lists » Devel » [patch 0/8] mount ownership and unprivileged mount syscall (v4)
Re: [patch 2/8] allow unprivileged umount [message #18429 is a reply to message #18408] |
Sat, 21 April 2007 13:29 ![Go to previous message Go to previous message](/theme/ovz3/images/up.png) ![Go to next message Go to previous message](/theme/ovz3/images/down.png) |
ebiederm
Messages: 1354 Registered: February 2006
|
Senior Member |
|
|
Miklos Szeredi <miklos@szeredi.hu> writes:
> From: Miklos Szeredi <mszeredi@suse.cz>
>
> The owner doesn't need sysadmin capabilities to call umount().
>
> Similar behavior as umount(8) on mounts having "user=UID" option in
> /etc/mtab. The difference is that umount also checks /etc/fstab,
> presumably to exclude another mount on the same mountpoint.
>
> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
> ---
>
> Index: linux/fs/namespace.c
> ===================================================================
> --- linux.orig/fs/namespace.c 2007-04-20 11:55:05.000000000 +0200
> +++ linux/fs/namespace.c 2007-04-20 11:55:06.000000000 +0200
> @@ -659,6 +659,25 @@ static int do_umount(struct vfsmount *mn
> }
>
> /*
> + * umount is permitted for
> + * - sysadmin
> + * - mount owner, if not forced umount
> + */
> +static bool permit_umount(struct vfsmount *mnt, int flags)
> +{
> + if (capable(CAP_SYS_ADMIN))
> + return true;
> +
> + if (!(mnt->mnt_flags & MNT_USER))
> + return false;
> +
> + if (flags & MNT_FORCE)
> + return false;
> +
> + return mnt->mnt_uid == current->uid;
> +}
I think this should be:
static bool permit_umount(struct vfsmount *mnt, int flags)
{
if ((mnt->mnt_uid != current->fsuid) && !capable(CAP_SETUID))
return false;
if ((flags & MNT_FORCE) && !capable(CAP_SYS_ADMIN))
return false;
return true;
}
I.e.
MNT_USER gone.
compare against fsuid.
Only require setuid for unmounts unless force is specified.
I suspect we can allow MNT_FORCE for non-privileged users
as well if we can trust the filesystem.
> +/*
> * Now umount can handle mount points as well as block devices.
> * This is important for filesystems which use unnamed block devices.
> *
> @@ -681,7 +700,7 @@ asmlinkage long sys_umount(char __user *
> goto dput_and_out;
>
> retval = -EPERM;
> - if (!capable(CAP_SYS_ADMIN))
> + if (!permit_umount(nd.mnt, flags))
> goto dput_and_out;
>
> retval = do_umount(nd.mnt, flags);
>
> --
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
|
|
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 0/8] mount ownership and unprivileged mount syscall (v4)
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 1/8] add user mounts to the kernel
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 1/8] add user mounts to the kernel
By: akpm on Sat, 21 April 2007 07:55
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 1/8] add user mounts to the kernel
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 1/8] add user mounts to the kernel
By: ebiederm on Sat, 21 April 2007 13:14
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 1/8] add user mounts to the kernel
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 1/8] add user mounts to the kernel
By: ebiederm on Sun, 22 April 2007 07:43
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 1/8] add user mounts to the kernel
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 1/8] add user mounts to the kernel
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 2/8] allow unprivileged umount
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
By: akpm on Sat, 21 April 2007 07:55
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
By: hpa on Sat, 21 April 2007 08:01
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
By: akpm on Sat, 21 April 2007 08:36
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
By: ebiederm on Sat, 21 April 2007 12:53
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
By: ebiederm on Sat, 21 April 2007 13:29
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
By: ebiederm on Sun, 22 April 2007 07:09
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 2/8] allow unprivileged umount
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 3/8] account user mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 3/8] account user mounts
By: akpm on Sat, 21 April 2007 07:55
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 3/8] account user mounts
By: ebiederm on Sat, 21 April 2007 13:37
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 3/8] account user mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 3/8] account user mounts
By: ebiederm on Sun, 22 April 2007 07:49
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 3/8] account user mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 4/8] propagate error values from clone_mnt
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 4/8] propagate error values from clone_mnt
By: ebiederm on Sat, 21 April 2007 13:40
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 5/8] allow unprivileged bind mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 5/8] allow unprivileged bind mounts
By: ebiederm on Sat, 21 April 2007 14:00
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 5/8] allow unprivileged bind mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 6/8] put declaration of put_filesystem() in fs.h
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 7/8] allow unprivileged mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
By: akpm on Sat, 21 April 2007 07:55
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
By: ebiederm on Sat, 21 April 2007 14:10
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
By: ebiederm on Sat, 21 April 2007 16:57
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
By: ebiederm on Sat, 21 April 2007 21:00
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 7/8] allow unprivileged mounts
By: ebiederm on Sat, 21 April 2007 21:33
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
[patch 8/8] allow unprivileged fuse mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 8/8] allow unprivileged fuse mounts
By: akpm on Sat, 21 April 2007 07:55
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 8/8] allow unprivileged fuse mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 8/8] allow unprivileged fuse mounts
By: ebiederm on Sat, 21 April 2007 14:18
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 8/8] allow unprivileged fuse mounts
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 0/8] mount ownership and unprivileged mount syscall (v4)
By: ebiederm on Wed, 25 April 2007 01:04
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 0/8] mount ownership and unprivileged mount syscall (v4)
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 0/8] mount ownership and unprivileged mount syscall (v4)
|
![Read Message Read Message](/theme/ovz3/images/read.png) |
|
Re: [patch 0/8] mount ownership and unprivileged mount syscall (v4)
|
Goto Forum:
Current Time: Tue Jul 16 09:58:26 GMT 2024
Total time taken to generate the page: 0.04325 seconds
|