From patchwork Tue Nov 17 16:39:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 7640011 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 967539F392 for ; Tue, 17 Nov 2015 17:20:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF921204E0 for ; Tue, 17 Nov 2015 17:20:26 +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 0C04F204D8 for ; Tue, 17 Nov 2015 17:20:25 +0000 (UTC) X-TM-IMSS-Message-ID: <324d90260005213c@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([63.239.67.10]) with ESMTP (TREND IMSS SMTP Service 7.1) id 324d90260005213c ; Tue, 17 Nov 2015 12:19:44 -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 tAHHIMux009638; Tue, 17 Nov 2015 12:18:26 -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 tAHGeFJU018606 for ; Tue, 17 Nov 2015 11:40: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 tAHGeCpl005521 for ; Tue, 17 Nov 2015 11:40:15 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1B5AACOVktWm6nfVdFeGQEBAg8BAQEBhE28R4QNhg8CgVBMAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSLgEBNwEPUTQBBQEcBgESIogMBZ4IgTE+MYpXhVQBBYtPAQEBAQEFAgEaBgqEOoIQiSaFEY4WiDiPBocyimSHBzaBF4JnIx2BX1MBgz8CHgeBIwEBAQ X-IPAS-Result: A1B5AACOVktWm6nfVdFeGQEBAg8BAQEBhE28R4QNhg8CgVBMAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSLgEBNwEPUTQBBQEcBgESIogMBZ4IgTE+MYpXhVQBBYtPAQEBAQEFAgEaBgqEOoIQiSaFEY4WiDiPBocyimSHBzaBF4JnIx2BX1MBgz8CHgeBIwEBAQ X-IronPort-AV: E=Sophos;i="5.20,308,1444708800"; d="scan'208";a="4940868" Received: from emvm-gh1-uea09.nsa.gov ([63.239.67.10]) by goalie.tycho.ncsc.mil with ESMTP; 17 Nov 2015 11:40:08 -0500 X-TM-IMSS-Message-ID: <322a6df6000515fa@nsa.gov> Received: from mail-io0-f169.google.com (mail-io0-f169.google.com [209.85.223.169]) by nsa.gov ([63.239.67.10]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 AES128-SHA (128/128)) id 322a6df6000515fa ; Tue, 17 Nov 2015 11:41:22 -0500 Received: by ioir85 with SMTP id r85so24349604ioi.1 for ; Tue, 17 Nov 2015 08:40:06 -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=++ffNWy9K/SPUwEYIi/wjELCWVoEiMnFuogd3EVCmSU=; b=Gtfn+5hEWnw23fYAuqem7Fv4T/UU7Yn56Sw84wWOEkkdTL8P/hDU6RXGWsCTRKWCPR fTqtRKoOcqr3fOjAAqJixf9YClZ508lMGNgbmqssg/sukjS60jjGR0s8fM0WzJRpNw2a DqTr+3Aj65GRjpoOir8hc3AvP9ljdfD5AC5LHRLuia+11P4eDCGrVQyHpPwff5olMWc3 fezox1KCQial7Qh/BsYzs3hrjCL+BX7VrvcAMz4+XuPe/4HD8kYq9nvEkshoguLg20uo kXmxxPyDxw1vXvtOh3UH3+ID0J54iAn65uiX/zgg8i5kz60SrLd8XT/eIgqIg35vrwy1 gqBQ== 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=++ffNWy9K/SPUwEYIi/wjELCWVoEiMnFuogd3EVCmSU=; b=dwjAiTyFTRGmeTjeJJlR+9hr4HS/CZUwNm9x6HADlV4ckiQZ+c0UTL/3X7XO0LkXWg kPgp2rhEMB2yqynWWmO/f024IWna6A9VE+qktyNLtRNK5MsH375CYGq4PezBHNggrDY6 T1hHWNsRdaTVTJl2ugNTq0Z/fp6HyBCCY1vehGBSDTf5X3beWY6hSvk5+2TVM1wFDU37 gwbVeBDp/jvSvpyi0rOrfCh1/3hhOpqZ2eCfLRxrY05z78VWnkI8LjEo22Nvp8EvGglH nfk1B9GGX4IsFbNQD7bcVuebOzneiwnpiKtu0qRw/CtDAvU4C5R2ZkANCcBwWB3lF4ex gmug== X-Gm-Message-State: ALoCoQl5KITMKafmcE1cbn+gEy7wtrhd/UbHhRI4zTVgNnPNY+tNaPymKbHzH86/bMDzfJt9OpMI X-Received: by 10.107.158.10 with SMTP id h10mr39968401ioe.63.1447778406495; Tue, 17 Nov 2015 08:40:06 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by smtp.gmail.com with ESMTPSA id rt5sm8344282igb.20.2015.11.17.08.40.05 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 17 Nov 2015 08:40:05 -0800 (PST) From: Seth Forshee To: "Eric W. Biederman" , David Woodhouse , Brian Norris Subject: [PATCH v3 3/7] mtd: Check permissions towards mtd block device inode when mounting Date: Tue, 17 Nov 2015 10:39:06 -0600 Message-Id: <1447778351-118699-4-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447778351-118699-1-git-send-email-seth.forshee@canonical.com> References: <1447778351-118699-1-git-send-email-seth.forshee@canonical.com> X-TM-AS-MML: disable X-Mailman-Approved-At: Tue, 17 Nov 2015 12:08:00 -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 , linux-security-module@vger.kernel.org, dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, Seth Forshee , linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, Alexander Viro , selinux@tycho.nsa.gov, linux-fsdevel@vger.kernel.org, Andy Lutomirski MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Unprivileged users should not be able to mount mtd block devices when they lack sufficient privileges towards the block device inode. Update mount_mtd() 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 --- drivers/mtd/mtdsuper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index b5b60e1af31c..5d7e7705fed8 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c @@ -125,6 +125,7 @@ struct dentry *mount_mtd(struct file_system_type *fs_type, int flags, #ifdef CONFIG_BLOCK struct block_device *bdev; int ret, major; + int perm; #endif int mtdnr; @@ -176,7 +177,10 @@ 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, 0); + perm = MAY_READ; + if (!(flags & MS_RDONLY)) + perm |= MAY_WRITE; + bdev = lookup_bdev(dev_name, perm); if (IS_ERR(bdev)) { ret = PTR_ERR(bdev); pr_debug("MTDSB: lookup_bdev() returned %d\n", ret);