[PATCH v2 02/18] block_dev: Check permissions towards block device inode when mounting

From	Seth Forshee <seth.forshee@canonical.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 02/18] block_dev: Check permissions towards block device inode when mounting
Date	2015-12-07 22:40 +0100
Message-ID	<qDbFN-1D6-43@gated-at.bofh.it> (permalink)
References	<qDbw5-1y2-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Unprivileged users should not be able to mount block devices when
they lack sufficient privileges towards the block device inode.
Update blkdev_get_by_path() to validate that the user has the
required access to the inode at the specified path. The check
will be skipped for CAP_SYS_ADMIN, so privileged mounts will
continue working as before.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
---
 fs/block_dev.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 3ebbde85d898..4fdb6ab59816 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1424,9 +1424,14 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
 					void *holder)
 {
 	struct block_device *bdev;
+	int perm = 0;
 	int err;
 
-	bdev = lookup_bdev(path, 0);
+	if (mode & FMODE_READ)
+		perm |= MAY_READ;
+	if (mode & FMODE_WRITE)
+		perm |= MAY_WRITE;
+	bdev = lookup_bdev(path, perm);
 	if (IS_ERR(bdev))
 		return bdev;
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/19] Support fuse mounts in user namespaces Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:30 +0100
  [PATCH v2 15/18] fuse: Add support for pid namespaces Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:30 +0100
  [PATCH v2 13/18] fs: Allow superblock owner to access do_remount_sb() Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:30 +0100
  [PATCH v2 17/18] fuse: Restrict allow_other to the superblock's namespace or a descendant Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:30 +0100
  [PATCH v2 10/18] fs: Update posix_acl support to handle user namespace mounts Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:30 +0100
  [PATCH v2 04/18] selinux: Add support for unprivileged mounts from user namespaces Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:40 +0100
  [PATCH v2 05/18] userns: Replace in_userns with current_in_userns Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:40 +0100
  [PATCH v2 09/18] fs: Refuse uid/gid changes which don't map into s_user_ns Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:40 +0100
  [PATCH v2 06/18] Smack: Handle labels consistently in untrusted mounts Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:40 +0100
  [PATCH v2 01/18] block_dev: Support checking inode permissions in lookup_bdev() Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:40 +0100
  [PATCH v2 02/18] block_dev: Check permissions towards block device inode when mounting Seth Forshee <seth.forshee@canonical.com> - 2015-12-07 22:40 +0100

csiph-web