From patchwork Mon Jan 4 18:03:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 7950031 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 801989F1C0 for ; Mon, 4 Jan 2016 18:23:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE762202B8 for ; Mon, 4 Jan 2016 18:23:45 +0000 (UTC) Received: from emvm-gh1-uea09.nsa.gov (emvm-gh1-uea09.nsa.gov [63.239.67.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 93F56202B4 for ; Mon, 4 Jan 2016 18:23:44 +0000 (UTC) X-TM-IMSS-Message-ID: <516d8ca1000225d0@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1) id 516d8ca1000225d0 ; Mon, 4 Jan 2016 13:24:13 -0500 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u04IKf8u015328; Mon, 4 Jan 2016 13:20:44 -0500 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u04I4Fab225723 for ; Mon, 4 Jan 2016 13:04:15 -0500 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u04I4Beb013312 for ; Mon, 4 Jan 2016 13:04:15 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1CSAAAys4pWm7bfVdFeGQEBAQEPAQEBAYRJiFm1aIYPAoFoAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSFRkBATcBD1E0AQUBHAYBEiKIDaJOgTE+MYpXhVQBBYweAQEBAQEBBAIBGgYKhDuCEYk6hQGNPneIVpZqhWJEjCo1gReCaA0VBx2BX1MBg0WBSgEBAQ X-IPAS-Result: A1CSAAAys4pWm7bfVdFeGQEBAQEPAQEBAYRJiFm1aIYPAoFoAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSFRkBATcBD1E0AQUBHAYBEiKIDaJOgTE+MYpXhVQBBYweAQEBAQEBBAIBGgYKhDuCEYk6hQGNPneIVpZqhWJEjCo1gReCaA0VBx2BX1MBg0WBSgEBAQ X-IronPort-AV: E=Sophos;i="5.20,521,1444708800"; d="scan'208";a="5070743" Received: from emvm-gh1-uea08.nsa.gov ([10.208.42.193]) by goalie.tycho.ncsc.mil with ESMTP; 04 Jan 2016 13:04:11 -0500 X-TM-IMSS-Message-ID: <75b640a200103451@nsa.gov> Received: from mail-io0-f182.google.com (mail-io0-f182.google.com [209.85.223.182]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 AES128-SHA (128/128)) id 75b640a200103451 ; Mon, 4 Jan 2016 13:03:47 -0500 Received: by mail-io0-f182.google.com with SMTP id 77so132118779ioc.2 for ; Mon, 04 Jan 2016 10:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GoO/o3FqSDk3KR3tvZ+229d2LWKpHnFBNt9dP6AKav0=; b=UBLnpGCXIXJLRA9Uipe+GQbbKmyzAHOQqMhSZsWtGuCSbzK7zZ2YZu5WFswVvaI+cV gsWMoPLD5sodaQD86ES2/5KaKjT21NU81+KyIXPbk2/2wHzoWWUgi9UkqCivoWU83xeW XzbsWms/aHiszhetTMhu+WC38M3eFFJgCNRZW+h70ZxuLbB6bDKmwXJYeAcbC4tQQyCT GPSOVbZfS/Ln4a29/1XQzoVaKHE52Q3kxX5xOmtFkZJoZrVFHbcYkauqesBo9QM/wVsT vQvBWHuSqw6yTocIt15HPT0veh5xZaLVASmTW55+SY+V/S4VBTCqzvbi/KPz0lKSo5ut UswA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GoO/o3FqSDk3KR3tvZ+229d2LWKpHnFBNt9dP6AKav0=; b=HY2r8JGKmetlv3O/SyhLH8hpmvoZcVDtQXO8DzTtCQ0J6c9SeyQWFylCMdqTvZA/4H aKWfQuCDAOLEAD3gYjAtYMDkNmahkfpHGF0zEj+sTcoGpE/APhFv7nV3wrljrNgUTArt e9EbB1F0gaP7Gi8CCsXuWnyubc+aIMy2Y75AAEFcke/4Dx7i/jo6SLyOq/LcYncCXuMx 8US7YssxWR/rgnl+74AssLSVNbCdz6sAM9bRka5nmVM2ULSbtXzlEUcXw7uF45afNRP0 Pw/N3fUvLGvRhBsfVhdAExJEQnFYzDBFwQjJlk2y0Uo+a/JuahYa+C5E1IOgaXG08A+J v2yQ== X-Gm-Message-State: ALoCoQkiMQBqQIf5t0lZVy7KyW/O5LXw8wIZ3shgaolrys+MT376v5uBliiRKm8rFfnQRTiXbzvayPcqn6x5e7ooTP5E1S87Bg== X-Received: by 10.107.14.131 with SMTP id 125mr72592460ioo.57.1451930650500; Mon, 04 Jan 2016 10:04:10 -0800 (PST) Received: from localhost ([66.64.121.229]) by smtp.gmail.com with ESMTPSA id 4sm3174igz.2.2016.01.04.10.04.09 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 04 Jan 2016 10:04:09 -0800 (PST) From: Seth Forshee To: "Eric W. Biederman" , Kent Overstreet , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Neil Brown , David Woodhouse , Brian Norris , Alexander Viro , Jan Kara , Jeff Layton , "J. Bruce Fields" Subject: [PATCH RESEND v2 01/18] block_dev: Support checking inode permissions in lookup_bdev() Date: Mon, 4 Jan 2016 12:03:40 -0600 Message-Id: <1451930639-94331-2-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451930639-94331-1-git-send-email-seth.forshee@canonical.com> References: <1451930639-94331-1-git-send-email-seth.forshee@canonical.com> X-TM-AS-MML: disable X-Mailman-Approved-At: Mon, 04 Jan 2016 13:14:22 -0500 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: Cc: Serge Hallyn , Seth Forshee , Miklos Szeredi , Richard Weinberger , linux-security-module@vger.kernel.org, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, fuse-devel@lists.sourceforge.net, Austin S Hemmelgarn , linux-mtd@lists.infradead.org, selinux@tycho.nsa.gov, linux-fsdevel@vger.kernel.org MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When looking up a block device by path no permission check is done to verify that the user has access to the block device inode at the specified path. In some cases it may be necessary to check permissions towards the inode, such as allowing unprivileged users to mount block devices in user namespaces. Add an argument to lookup_bdev() to optionally perform this permission check. A value of 0 skips the permission check and behaves the same as before. A non-zero value specifies the mask of access rights required towards the inode at the specified path. The check is always skipped if the user has CAP_SYS_ADMIN. All callers of lookup_bdev() currently pass a mask of 0, so this patch results in no functional change. Subsequent patches will add permission checks where appropriate. Signed-off-by: Seth Forshee Acked-by: Serge Hallyn --- drivers/md/bcache/super.c | 2 +- drivers/md/dm-table.c | 2 +- drivers/mtd/mtdsuper.c | 2 +- fs/block_dev.c | 13 ++++++++++--- fs/quota/quota.c | 2 +- include/linux/fs.h | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 679a093a3bf6..e8287b0d1dac 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1926,7 +1926,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, sb); if (IS_ERR(bdev)) { if (bdev == ERR_PTR(-EBUSY)) { - bdev = lookup_bdev(strim(path)); + bdev = lookup_bdev(strim(path), 0); mutex_lock(&bch_register_lock); if (!IS_ERR(bdev) && bch_is_open(bdev)) err = "device already registered"; diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 061152a43730..81c60b2495ed 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -380,7 +380,7 @@ int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode, BUG_ON(!t); /* convert the path to a device */ - bdev = lookup_bdev(path); + bdev = lookup_bdev(path, 0); if (IS_ERR(bdev)) { dev = name_to_dev_t(path); if (!dev) diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index 20c02a3b7417..b5b60e1af31c 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c @@ -176,7 +176,7 @@ struct dentry *mount_mtd(struct file_system_type *fs_type, int flags, /* try the old way - the hack where we allowed users to mount * /dev/mtdblock$(n) but didn't actually _use_ the blockdev */ - bdev = lookup_bdev(dev_name); + bdev = lookup_bdev(dev_name, 0); if (IS_ERR(bdev)) { ret = PTR_ERR(bdev); pr_debug("MTDSB: lookup_bdev() returned %d\n", ret); diff --git a/fs/block_dev.c b/fs/block_dev.c index f90d91efa1b4..3ebbde85d898 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1426,7 +1426,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode, struct block_device *bdev; int err; - bdev = lookup_bdev(path); + bdev = lookup_bdev(path, 0); if (IS_ERR(bdev)) return bdev; @@ -1736,12 +1736,14 @@ EXPORT_SYMBOL(ioctl_by_bdev); /** * lookup_bdev - lookup a struct block_device by name * @pathname: special file representing the block device + * @mask: rights to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC) * * Get a reference to the blockdevice at @pathname in the current * namespace if possible and return it. Return ERR_PTR(error) - * otherwise. + * otherwise. If @mask is non-zero, check for access rights to the + * inode at @pathname. */ -struct block_device *lookup_bdev(const char *pathname) +struct block_device *lookup_bdev(const char *pathname, int mask) { struct block_device *bdev; struct inode *inode; @@ -1756,6 +1758,11 @@ struct block_device *lookup_bdev(const char *pathname) return ERR_PTR(error); inode = d_backing_inode(path.dentry); + if (mask != 0 && !capable(CAP_SYS_ADMIN)) { + error = __inode_permission(inode, mask); + if (error) + goto fail; + } error = -ENOTBLK; if (!S_ISBLK(inode->i_mode)) goto fail; diff --git a/fs/quota/quota.c b/fs/quota/quota.c index 3746367098fd..a40eaecbd5cc 100644 --- a/fs/quota/quota.c +++ b/fs/quota/quota.c @@ -733,7 +733,7 @@ static struct super_block *quotactl_block(const char __user *special, int cmd) if (IS_ERR(tmp)) return ERR_CAST(tmp); - bdev = lookup_bdev(tmp->name); + bdev = lookup_bdev(tmp->name, 0); putname(tmp); if (IS_ERR(bdev)) return ERR_CAST(bdev); diff --git a/include/linux/fs.h b/include/linux/fs.h index 8a17c5649ef2..879ec382fd88 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2373,7 +2373,7 @@ static inline void unregister_chrdev(unsigned int major, const char *name) #define BLKDEV_MAJOR_HASH_SIZE 255 extern const char *__bdevname(dev_t, char *buffer); extern const char *bdevname(struct block_device *bdev, char *buffer); -extern struct block_device *lookup_bdev(const char *); +extern struct block_device *lookup_bdev(const char *, int mask); extern void blkdev_show(struct seq_file *,off_t); #else