Message ID | 1461339521-123191-22-git-send-email-seth.forshee@canonical.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show
Return-Path: <selinux-bounces@tycho.nsa.gov> 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 9B846BF29F for <patchwork-selinux@patchwork.kernel.org>; Fri, 22 Apr 2016 15:54:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDA5D2015E for <patchwork-selinux@patchwork.kernel.org>; Fri, 22 Apr 2016 15:54:50 +0000 (UTC) Received: from emvm-gh1-uea09.nsa.gov (smtp.nsa.gov [8.44.101.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 113FE2014A for <patchwork-selinux@patchwork.kernel.org>; Fri, 22 Apr 2016 15:54:49 +0000 (UTC) X-TM-IMSS-Message-ID: <ad9fb6b100000a3f@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 ad9fb6b100000a3f ; Fri, 22 Apr 2016 11:51:06 -0400 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 u3MFpVWg008889; Fri, 22 Apr 2016 11:51:31 -0400 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 u3MFdoPw105342 for <selinux@prometheus.infosec.tycho.ncsc.mil>; Fri, 22 Apr 2016 11:39:50 -0400 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 u3MFdlDe004476 for <selinux@tycho.nsa.gov>; Fri, 22 Apr 2016 11:39:49 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CqBABlRRpX/yQp0ApeHYJwgXu3d4QQhg4CgXQBAQEBAQFmJ4RCAQEBAxIuAQE3AQ9RNAEFARwGARIiiAgBoHCBMT4xik+FKAEEjFwBAQEBAQEEAgEXBgqEDYIKjmABjVd0iUiBVYxBiSmFZY1xMIEOYoF4DRuBaU4BiHoBAQE X-IPAS-Result: A0CqBABlRRpX/yQp0ApeHYJwgXu3d4QQhg4CgXQBAQEBAQFmJ4RCAQEBAxIuAQE3AQ9RNAEFARwGARIiiAgBoHCBMT4xik+FKAEEjFwBAQEBAQEEAgEXBgqEDYIKjmABjVd0iUiBVYxBiSmFZY1xMIEOYoF4DRuBaU4BiHoBAQE X-IronPort-AV: E=Sophos;i="5.24,517,1454994000"; d="scan'208";a="5402631" Received: from emsm-gh1-uea10.corp.nsa.gov (HELO emsm-gh1-uea10.nsa.gov) ([10.208.41.36]) by goalie.tycho.ncsc.mil with ESMTP; 22 Apr 2016 11:39:35 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AOdc88BxssiEyapLXCy+O+j09IxM/srCxBDY+r6Qd?= =?us-ascii?q?0OgQIJqq85mqBkHD//Il1AaPBtWLra0cwLqK+4nbGkU+or+5+EgYd5JNUxJXwe?= =?us-ascii?q?43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6anHS+4HYoFwnlMkIt?= =?us-ascii?q?f6KuSt6U0Jz8h7z60qaQSjsLrQL1Wal1IhSyoFeZnegtqqwmFJwMzADUqGBDYe?= =?us-ascii?q?VcyDAgD1uSmxHh+pX4p8Y7oGx48sgs/M9YUKj8Y79wDfkBVGxnYCgJ45ihmAPC?= =?us-ascii?q?RkOwoDM2U2ganwBNCg6PpEX3VJb8vibgs8Jt3SiBJszxS/Y/XjH0q+9OSRzsjz?= =?us-ascii?q?xPDCw06mzbi4QkiaNYpBW6jwdtzpTZbIDTNOcoLY3HetZPfmddXo5/UDZaAo6x?= =?us-ascii?q?J98UAvYBe+hftZL9qlYmphK4Ag+tD+rrjDRPgymljuUBz+09HFSej0QbFNUUvS?= =?us-ascii?q?GR9Y2tOQ=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A1EmAQCfQhpXiDDaVdFeHAGCcIF7t3eEE?= =?us-ascii?q?IINhAECgXQBAQEBAQECAg8BAQEICwsJH4JefVs9AQEBAxIuAQE3AQ9RNAEFARw?= =?us-ascii?q?GARIiiAgBoGyBMT4xik+FKAEEjF0BAQEBAQEEAgEXBgqEDYIKjmCNWHSJSIFVj?= =?us-ascii?q?EGJKYVljXEwgQ6CWg0RCoFpTgGIegEBAQ?= X-IPAS-Result: =?us-ascii?q?A1EmAQCfQhpXiDDaVdFeHAGCcIF7t3eEEIINhAECgXQBAQE?= =?us-ascii?q?BAQECAg8BAQEICwsJH4JefVs9AQEBAxIuAQE3AQ9RNAEFARwGARIiiAgBoGyBM?= =?us-ascii?q?T4xik+FKAEEjF0BAQEBAQEEAgEXBgqEDYIKjmCNWHSJSIFVjEGJKYVljXEwgQ6?= =?us-ascii?q?CWg0RCoFpTgGIegEBAQ?= X-IronPort-AV: E=Sophos;i="5.24,517,1454976000"; d="scan'208";a="12934466" Received: from emvm-gh1-uea08.nsa.gov ([10.208.42.193]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-SHA; 22 Apr 2016 15:39:34 +0000 X-TM-IMSS-Message-ID: <61b65a1400000577@nsa.gov> Received: from mail-oi0-f48.google.com (mail-oi0-f48.google.com [209.85.218.48]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 AES128-SHA (128/128)) id 61b65a1400000577 ; Fri, 22 Apr 2016 11:38:55 -0400 Received: by mail-oi0-f48.google.com with SMTP id x201so120342725oif.3 for <selinux@tycho.nsa.gov>; Fri, 22 Apr 2016 08:39:33 -0700 (PDT) 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=gvNSPbc6kjzR3K5OXtYXt0bIardtINsGcWVt0R/nQGo=; b=uQ/oOsEyJBK74rvHnJL7yQoYxRR6qI0vMG90vDY32TWiHgInN3kQg+ttPTvotzPXaX qBbpGbaeqDbWpIH7m5cOHil2tJFs6Q3ugAr80vSQFjvb94axmbYqV9/IIaVq7WSLm4Av ZGu1NMjHWtaZSRhqx1PJldR/5gy3IzaQQ5ExIsDq2ccGImJyPBDqWMvvvT/Qd8yW3isf 5KbXo+pcHuFIeYMNMGePTEhsxYTkMN4aUDi8lWAtGa1kvdLwNs2IoSXLaRoXiLK55GZy RysUuetJPvdsC96WfAv+7jmogJwHgQny46r0LbXQajTqN2EEaNUgVbMF1oGgqQ4A8xaC Lh9w== 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=gvNSPbc6kjzR3K5OXtYXt0bIardtINsGcWVt0R/nQGo=; b=chNkl4rGCNNgXZ8eazcTsZDa0EVeJbHy+Evcp136oW+Nv/mNm6B2eiEqzxWDhmbRLM 3KqMw3BpEn3xiqoVqiM/RBBrP7saydYeq/L2QWJmV54NvbIbdroM2t2pq7Hxu/yzOjP2 83V0fHDkUmxXwRar+/aegP77rHTp1iIZog5Vh+N7eN43QKex3fO8P4ox7U7KYgDmf5z+ U4oIZgIjV/DKvNzyo7imSjAwCCJm4oYOH00BD8zkmk+5dDQodlexM2KSvmcEShwAro+k rGZaGNmVqJNkkHCbgHWTiYGAtKqde8pJ5IrK4Zvv1rGVeyHofnQWYb4iSE3w3lyDcfQP EVgg== X-Gm-Message-State: AOPr4FWQzRCywfU9/MUxOkjAE/eRdvNeB4QmhMb+SjsA7H7SJnhfc27e3gH5PYUc9tIkUm47 X-Received: by 10.157.48.98 with SMTP id w31mr9328288otd.21.1461339573354; Fri, 22 Apr 2016 08:39:33 -0700 (PDT) Received: from localhost ([2605:a601:aab:f920:ad1c:41df:dcb1:a4a0]) by smtp.gmail.com with ESMTPSA id b7sm2013168oej.16.2016.04.22.08.39.32 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 22 Apr 2016 08:39:32 -0700 (PDT) From: Seth Forshee <seth.forshee@canonical.com> To: "Eric W. Biederman" <ebiederm@xmission.com>, Miklos Szeredi <miklos@szeredi.hu> Subject: [PATCH v3 21/21] fuse: Allow user namespace mounts Date: Fri, 22 Apr 2016 10:38:38 -0500 Message-Id: <1461339521-123191-22-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461339521-123191-1-git-send-email-seth.forshee@canonical.com> References: <1461339521-123191-1-git-send-email-seth.forshee@canonical.com> X-TM-AS-MML: disable X-Mailman-Approved-At: Fri, 22 Apr 2016 11:40:27 -0400 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" <selinux.tycho.nsa.gov> List-Post: <mailto:selinux@tycho.nsa.gov> List-Help: <mailto:selinux-request@tycho.nsa.gov?subject=help> Cc: linux-bcache@vger.kernel.org, Serge Hallyn <serge.hallyn@canonical.com>, Seth Forshee <seth.forshee@canonical.com>, dm-devel@redhat.com, Miklos Szeredi <mszeredi@redhat.com>, Richard Weinberger <richard.weinberger@gmail.com>, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, fuse-devel@lists.sourceforge.net, Austin S Hemmelgarn <ahferroin7@gmail.com>, linux-mtd@lists.infradead.org, Alexander Viro <viro@zeniv.linux.org.uk>, selinux@tycho.nsa.gov, linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, Pavel Tikhomirov <ptikhomirov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" <selinux-bounces@tycho.nsa.gov> X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 |
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 0a771145d853..254f1944ee98 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1199,7 +1199,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, }; @@ -1231,7 +1231,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");