From patchwork Mon Jan 4 18:03:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 7950351 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 733DB9F6CD for ; Mon, 4 Jan 2016 18:58:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B191E20306 for ; Mon, 4 Jan 2016 18:58:29 +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 DBB0320320 for ; Mon, 4 Jan 2016 18:58:28 +0000 (UTC) X-TM-IMSS-Message-ID: <518da7df00022979@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 518da7df00022979 ; Mon, 4 Jan 2016 13:59:17 -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 u04Itlpp019030; Mon, 4 Jan 2016 13:55:49 -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 u04I4wpf225819 for ; Mon, 4 Jan 2016 13:04:58 -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 u04I4wmh013678 for ; Mon, 4 Jan 2016 13:04:58 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1CSAAAys4pWm7XVVdFeGQEBAQEPAQEBAYRJiFm1aIYPAoFoAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSLgEBNwEPUTQBBQEcBgESIogNok6BMT4xileFVAEFjB4BAQEBAQEEAgEaBgqEO4IRjjuNPneIVpZqhWKMbjWBF4JoDRUHgXxTAYUPAQEB X-IPAS-Result: A1CSAAAys4pWm7XVVdFeGQEBAQEPAQEBAYRJiFm1aIYPAoFoAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSLgEBNwEPUTQBBQEcBgESIogNok6BMT4xileFVAEFjB4BAQEBAQEEAgEaBgqEO4IRjjuNPneIVpZqhWKMbjWBF4JoDRUHgXxTAYUPAQEB X-IronPort-AV: E=Sophos;i="5.20,521,1444708800"; d="scan'208";a="5070766" Received: from emvm-gh1-uea08.nsa.gov ([10.208.42.193]) by goalie.tycho.ncsc.mil with ESMTP; 04 Jan 2016 13:04:49 -0500 X-TM-IMSS-Message-ID: <75b6d4f5001034b8@nsa.gov> Received: from mail-ig0-f181.google.com (mail-ig0-f181.google.com [209.85.213.181]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 AES128-SHA (128/128)) id 75b6d4f5001034b8 ; Mon, 4 Jan 2016 13:04:25 -0500 Received: by mail-ig0-f181.google.com with SMTP id ph11so250383411igc.1 for ; Mon, 04 Jan 2016 10:04:49 -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=V9f5csuSCjWl9AnUtgVNOUexbWooD0z/+rwSox7xHLs=; b=RnOVCV/Dhg1N3z7FuZ3/SREh/0N0AiH2kuIdX69Y29tpX+0LABXoXjLAqavklG4V+K nIMGhRd3fg6/12cdGxPK8gro/7KycQIP6VvWDPYutQKfh9pSJRUWs6prvntwFg34eUL9 T4d/k41JnUMolwQ1eGeHMYRQHxi/4H2m6EFtoMfiAOVWkSmtUDKzsvDl6UeWz/KgFoSK oQvXM6A1iFf3xFbm6aWqf79JLOJgOT8XEzadoTQrUdrHLdniQQ0ElT8A4Tmj+F6OLOKR d0GuiEX3O/kPMvmvbZMNC03QY5xjUcK4cK3bYpOdWUQwE+oT4Q6epkTSYzPXAGgFnfXo Ni7g== 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=V9f5csuSCjWl9AnUtgVNOUexbWooD0z/+rwSox7xHLs=; b=WKu6UKRJSvuL57qhOdWyW9wzqPxRpo3bh/0D8scqftSUc5TMATcIQp31L4iX72svRa hmi66/U2nqe9WEZmhKIBwKRgHYOt+VbMjrJ5ZQ5uDhuDTnPr7fDu0BAtRjbybr+agpsx klk07WxTb6gNUV3MHzql6BgTKzcX1YOZRvf8kbqzLdvztamdMXzBrk9csmYXF798oX74 tWGHqi41cAcmaW8R55r7BgfJUoLxAYMB2LdiqLuZbbNYzA/1snZd5C7lEPQ75V1JL+qc PrxlWnX6jYYKoahNkQUTZa4quy9HFAAb2t/jySVWGG/pKEWFKBuMOXDU8y83wRnpbdlh 3Qhw== X-Gm-Message-State: ALoCoQk1174WjBJ1M6L/y2WnARK7mjvX8/9vR0TfpaAk8WqQaOxSiNsenGrCZ1F+l0Hg33wx8IR6psdjOZ+I3Tzc5yiuVHp5jA== X-Received: by 10.50.6.42 with SMTP id x10mr85180044igx.14.1451930688444; Mon, 04 Jan 2016 10:04:48 -0800 (PST) Received: from localhost ([66.64.121.229]) by smtp.gmail.com with ESMTPSA id y143sm34872490iod.35.2016.01.04.10.04.47 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 04 Jan 2016 10:04:47 -0800 (PST) From: Seth Forshee To: "Eric W. Biederman" , Miklos Szeredi Subject: [PATCH RESEND v2 18/18] fuse: Allow user namespace mounts Date: Mon, 4 Jan 2016 12:03:57 -0600 Message-Id: <1451930639-94331-19-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 , dm-devel@redhat.com, linux-security-module@vger.kernel.org, Richard Weinberger , 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, Alexander Viro , 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=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 Signed-off-by: Seth Forshee Acked-by: Miklos Szeredi --- fs/fuse/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index b7bdfdac3521..2fd338c199ce 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1201,7 +1201,7 @@ static void fuse_kill_sb_anon(struct super_block *sb) static struct file_system_type fuse_fs_type = { .owner = THIS_MODULE, .name = "fuse", - .fs_flags = FS_HAS_SUBTYPE, + .fs_flags = FS_HAS_SUBTYPE | FS_USERNS_MOUNT, .mount = fuse_mount, .kill_sb = fuse_kill_sb_anon, }; @@ -1233,7 +1233,7 @@ static struct file_system_type fuseblk_fs_type = { .name = "fuseblk", .mount = fuse_mount_blk, .kill_sb = fuse_kill_sb_blk, - .fs_flags = FS_REQUIRES_DEV | FS_HAS_SUBTYPE, + .fs_flags = FS_REQUIRES_DEV | FS_HAS_SUBTYPE | FS_USERNS_MOUNT, }; MODULE_ALIAS_FS("fuseblk");