From patchwork Wed Dec 2 15:40:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 7748721 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1CC5CBEEE1 for ; Wed, 2 Dec 2015 16:38:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E0D32053F for ; Wed, 2 Dec 2015 16:38:43 +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 A02E220503 for ; Wed, 2 Dec 2015 16:38:42 +0000 (UTC) X-TM-IMSS-Message-ID: <23828f8c00006a35@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 23828f8c00006a35 ; Wed, 2 Dec 2015 11:38:58 -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 tB2Gawaf012477; Wed, 2 Dec 2015 11:37:04 -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 tB2Fggbn185625 for ; Wed, 2 Dec 2015 10:42:42 -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 tB2FgWlO006648 for ; Wed, 2 Dec 2015 10:42:42 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1ChAAA0EF9Wm7PfVdFeGQEBAQEPAQEBAYRMu3CEFoYOAoIYAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSLgEBNwEPUTQBBQEcBgESIogNoRWBMT4xileFVAEFjCMBAQEBAQEEAgEaBgqEOoIQjjaNKnaIQZZMkgw2gReCZw0WB4F1UwGFbgEBAQ X-IPAS-Result: A1ChAAA0EF9Wm7PfVdFeGQEBAQEPAQEBAYRMu3CEFoYOAoIYAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSLgEBNwEPUTQBBQEcBgESIogNoRWBMT4xileFVAEFjCMBAQEBAQEEAgEaBgqEOoIQjjaNKnaIQZZMkgw2gReCZw0WB4F1UwGFbgEBAQ X-IronPort-AV: E=Sophos;i="5.20,373,1444708800"; d="scan'208";a="4986136" Received: from emvm-gh1-uea08.nsa.gov ([10.208.42.193]) by goalie.tycho.ncsc.mil with ESMTP; 02 Dec 2015 10:42:42 -0500 X-TM-IMSS-Message-ID: <2356efd300015f1e@nsa.gov> Received: from mail-io0-f179.google.com (mail-io0-f179.google.com [209.85.223.179]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 AES128-SHA (128/128)) id 2356efd300015f1e ; Wed, 2 Dec 2015 10:42:49 -0500 Received: by ioc74 with SMTP id 74so49338469ioc.2 for ; Wed, 02 Dec 2015 07:42:39 -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=B+dztw6kH9kfz1jPRzXn6MR6Xmy3OhMt3kzX8xahU0o=; b=ier0GENgrCA2IDc8ZNt0Stf0Gv6JtK6W4yXl67gWV/DFh1lxEHaDu1Gd2Iwy/PBiO0 2+0lzvIxku0+h1zQl2fcwy8e+wXLiyOIaH9Gd+u8Uoxfw7GuL4WIlfaWRgnuMcV8Y7ah yp/eaSs22UjHD1zFg050TrEyudztWGCvbirWwGqojm0xvA5QnIZJbOhJtqJQnKaTY2rp rA7/XmDTawuNTxU7Ojxkiqp38CiwcJDqVgUK3YFxP5FMfbaT9w1uK9C6xj4PWTMU9QMZ 4SEGHxz9NAxE3PqTpbNPsOfeaDbfi3PjgG52aXxa4R2q/JUigCWNExfvU/sXoJDwWhJo rHUA== 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=B+dztw6kH9kfz1jPRzXn6MR6Xmy3OhMt3kzX8xahU0o=; b=DHtjEoAPQpWZzCf3QJF5Vbh/gM3xjhZNJ13drScr2U9gAeDqeWDdImhDPd9MbV+2+4 UnoVz/lhthcJwAdHClBqIL6IjbhVTCAG3+cTuL00O6R7zSe0TCEajYVHL0kka6ANT8vl IRazICd6bdwRrUIV579XmLVWdd9mDAPTMwVp+psTufYfRq2sDj6TLPGB8+7rjuwxubQ/ LA36Fi2sIFF7m323+t1Zf5dNbB3H/yBzzvVckhrEs/f0afTo5oczbU3e+KoKjmx6TPML r32skS7zXY8xWzLgRMuq+OAZ8f58oLsGAIoCLs5M6Eq4IzAHNA4MGAot5AZZS9gDtZ2f 9P1Q== X-Gm-Message-State: ALoCoQnrds0Lvt5t4Ea1ice1uZ0rrHPH8FjDgwTxhqPboNBhjAXYgHj0BWV4dgBUMy+MxXfdH2S9 X-Received: by 10.107.166.82 with SMTP id p79mr4079569ioe.187.1449070959775; Wed, 02 Dec 2015 07:42:39 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by smtp.gmail.com with ESMTPSA id j17sm1344006ioe.41.2015.12.02.07.42.39 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 02 Dec 2015 07:42:39 -0800 (PST) From: Seth Forshee To: "Eric W. Biederman" , Miklos Szeredi Subject: [PATCH 19/19] fuse: Allow user namespace mounts Date: Wed, 2 Dec 2015 09:40:19 -0600 Message-Id: <1449070821-73820-20-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449070821-73820-1-git-send-email-seth.forshee@canonical.com> References: <1449070821-73820-1-git-send-email-seth.forshee@canonical.com> X-TM-AS-MML: disable X-Mailman-Approved-At: Wed, 02 Dec 2015 11:15:49 -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,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 --- 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 ea61a7639a8e..ffce4354563e 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1233,7 +1233,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, }; @@ -1265,7 +1265,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");