Message ID | 1461699396-33000-22-git-send-email-seth.forshee@canonical.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <selinux-bounces@tycho.nsa.gov> 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 9E21B9F1D3 for <patchwork-selinux@patchwork.kernel.org>; Tue, 26 Apr 2016 20:14:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBFDC20138 for <patchwork-selinux@patchwork.kernel.org>; Tue, 26 Apr 2016 20:14:02 +0000 (UTC) Received: from emsm-gh1-uea11.nsa.gov (smtp.nsa.gov [8.44.101.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B3423201EF for <patchwork-selinux@patchwork.kernel.org>; Tue, 26 Apr 2016 20:14:01 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.24,538,1454976000"; d="scan'208";a="15644238" IronPort-PHdr: =?us-ascii?q?9a23=3AHb3swREu/gjhtoElePwnZJ1GYnF86YWxBRYc798d?= =?us-ascii?q?s5kLTJ74pcSwAkXT6L1XgUPTWs2DsrQf27qQ7PGrADdeqb+681k8M7V0Hycfjs?= =?us-ascii?q?sXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aJBzzOEJP?= =?us-ascii?q?K/jvHcaK1oLsh7D0pMyYOl4WzBOGIppMbzyO5T3LsccXhYYwYo0Q8TDu5kVyRu?= =?us-ascii?q?JN2GlzLkiSlRuvru25/Zpk7jgC86l5r50IeezAcq85Vb1VCig9eyBwvZWz9EqL?= =?us-ascii?q?cQzarFYGU25erVwAKQnI4BzgW573+GOuu+B81SWXJ8jeXbU1Qi+j6KEtQxjt3m?= =?us-ascii?q?NPEj869GbMwvdigbhWrBPp8xl+wIrTe6mOJvdkc6/cO9MHEzlvRMFUAhdMHoP0?= =?us-ascii?q?QYwVFOoMMK4MtIThpx0AqgGlBQShLOjmzDhOh3T/2esx1OF3QlKO5xApA99b6C?= =?us-ascii?q?ecl97yLqpHFLntlKQ=3D?= X-IPAS-Result: =?us-ascii?q?A2EJBQBiyx9X/wHyM5BeHAGCcCuBULt0IoF2hUVMAQEBAQE?= =?us-ascii?q?BAgJiJ4ItfVs9AQEBAwECDygGAQEMIAsBAgMJAQEXKQgIAwEtAwEFAQsRBgEHC?= =?us-ascii?q?wUYBAGICAGlUYExPjGKT4UoAQSMRwEBAQcBAQEBFgYKhA2CCohaEQGFdAGNWHS?= =?us-ascii?q?JSIFVjESJKiWFQI1yMIEOYoIFG4FpTgGHeIE1AQEB?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2016 20:13:41 +0000 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 u3QKDdrN022455; Tue, 26 Apr 2016 16:13:39 -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 u3QJbKcZ172342 for <selinux@prometheus.infosec.tycho.ncsc.mil>; Tue, 26 Apr 2016 15:37:20 -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 u3QJak0A011587 for <selinux@tycho.nsa.gov>; Tue, 26 Apr 2016 15:37:19 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0A+BQD9wR9X/yUp0ApeHYJwK4FQt3CEEYYPAoFATAEBAQEBAWYnhEIBAQEDEi4BATcBD1E0AQUBHAYBEiKICAGlV4ExPjGKT4UoAQSMSgEBAQEBAQQCARcGCoQNggqOYI1ZdIlIgVWMRIkqhWWNcjCBDmKBeA0bgWlOAYktAQEB X-IPAS-Result: A0A+BQD9wR9X/yUp0ApeHYJwK4FQt3CEEYYPAoFATAEBAQEBAWYnhEIBAQEDEi4BATcBD1E0AQUBHAYBEiKICAGlV4ExPjGKT4UoAQSMSgEBAQEBAQQCARcGCoQNggqOYI1ZdIlIgVWMRIkqhWWNcjCBDmKBeA0bgWlOAYktAQEB X-IronPort-AV: E=Sophos;i="5.24,537,1454994000"; d="scan'208";a="5410396" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 26 Apr 2016 15:37:20 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AtHVfYR16qvOlYACtsmDT+DRfVm0co7zxezQtwd8Z?= =?us-ascii?q?sekUIvad9pjvdHbS+e9qxAeQG96Lu7Qb2qGP6PiocFdDyKjCmUhKSIZLWR4BhJ?= =?us-ascii?q?detC0bK+nBN3fGKuX3ZTcxBsVIWQwt1Xi6NU9IBJS2PAWK8TWM5DIfUi/yKRBy?= =?us-ascii?q?brysXNWC34LohqvroMWbSj4LrQT+SIs6FA+xowTVu5teqqpZAYF19CH0pGBVcf?= =?us-ascii?q?9d32JiKAHbtR/94sCt4MwrqHwI6LoJvvRNWqTifqk+UacQTHF/azh0t4XXskyJ?= =?us-ascii?q?YBGO7TMjFC08kxdEDhLA5RewFsP8uCr3uudn3QGKOMztVrEzX3Kp6KI9DFfNiS?= =?us-ascii?q?QDMCVxy3PakMF8jeoPpROioxtk65XGbZuYOPs4fr6LLv0AQm8UZctNV2RvBZmn?= =?us-ascii?q?b4YCR74aMPpY6Yf6vUAOoBaWDgCqA+XuwTZMwHTx2PtpgKwaDQja0Vl4TJo1u3?= =?us-ascii?q?POoYCwbf9KXA=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0HzAAD9wR9Xj7bVVdFeHYJwgXu3cIQRg?= =?us-ascii?q?g2EAgKBQEwBAQEBAQECAg8BAQEBBwsLCSEvgi19Wz0BAQEDEi4BATcBD1E0AQU?= =?us-ascii?q?BHAYBEiKICAGlV4ExPjGKT4UoAQSMSgEBAQEBAQQCARcGCoQNggqOYI1ZdIlIg?= =?us-ascii?q?VWMRIkqhWWNcjCBDoJaDREKgWlOAYktAQEB?= X-IPAS-Result: =?us-ascii?q?A0HzAAD9wR9Xj7bVVdFeHYJwgXu3cIQRgg2EAgKBQEwBAQE?= =?us-ascii?q?BAQECAg8BAQEBBwsLCSEvgi19Wz0BAQEDEi4BATcBD1E0AQUBHAYBEiKICAGlV?= =?us-ascii?q?4ExPjGKT4UoAQSMSgEBAQEBAQQCARcGCoQNggqOYI1ZdIlIgVWMRIkqhWWNcjC?= =?us-ascii?q?BDoJaDREKgWlOAYktAQEB?= X-IronPort-AV: E=Sophos;i="5.24,537,1454976000"; d="scan'208";a="15642570" Received: from mail-ig0-f182.google.com ([209.85.213.182]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/AES128-GCM-SHA256; 26 Apr 2016 19:37:18 +0000 Received: by mail-ig0-f182.google.com with SMTP id g8so25529250igr.0 for <selinux@tycho.nsa.gov>; Tue, 26 Apr 2016 12:37:18 -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=TZ95t5kEVYJ729MJMguIjd5rNvxKhdNn5VRYSIMAaUg=; b=xpAqK7Ee3KwoKL4SdXN1CmyzuLX+zZ5aV3sATpTHJvKE+ULSvLKbp7vurWsosf7IXa qJE4RqAwoJyCv2uG+tHM44xKR83L+V8YBP6ltDMSlOl71/UtUuKC9rVQ6qfnjiHBsLRL OC0LMynwTBJP33bY2xDmNLJW6oTvNXbkSdOQ0QSg+Pp4NwfTN9nqZiSCxDzmDzT3Oq8C +IqqljRxc8mlh1vTocjzNiscpjQgwbaLfS42ujTkSWWrRzkYUDzOZ08yuUkFbCG1bGuy heZl0cMw6mQYC9p20fjmiPpHfSxDWfLvbauAocW2vOnYVuPyVCUzasYnSGH1ggpVyyER zTBQ== 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=TZ95t5kEVYJ729MJMguIjd5rNvxKhdNn5VRYSIMAaUg=; b=UvmchrYkUTIHaVU75bhPdy4cZenF+E0D26GxzKBVeWtJkdRm+sXlChA6Rb34qlayzt +TzW1CBJ5BN7izlXfEQ2IbSfavDEg9O8HxGxOBdBGY6bhdhZa+7XnMQij5WIcvCm2hGe 47WfQKWCL9hY58piAY5hsA9BZyXJMX1NRbOUvaNCaC1j8JJ159d2RLK/4KeTmZdJgo92 bpW9Kn76L0SbXg3p9WDfG2e0AMhN35tHv1/0MFo9+WLlF7+1zCEr8ml+K/B5hLre5vcL gO/+9t6MjxFOfz1evN8Uyo5n75iI/eQZGZQPccXUyITmxjltA3bVvkNlTl+fYSct2hN5 6DRQ== X-Gm-Message-State: AOPr4FXaPRniSV/mYn3+B2QgTmTolp4cNmjgZYQcRpOu04X31H/SfpDSZVba7+bEvALcrJrC X-Received: by 10.50.228.175 with SMTP id sj15mr5900155igc.35.1461699438337; Tue, 26 Apr 2016 12:37:18 -0700 (PDT) Received: from localhost ([2605:a601:aab:f920:39a1:5bcf:aa:5b00]) by smtp.gmail.com with ESMTPSA id o127sm2396570iof.0.2016.04.26.12.37.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 12:37:17 -0700 (PDT) From: Seth Forshee <seth.forshee@canonical.com> To: "Eric W. Biederman" <ebiederm@xmission.com>, Miklos Szeredi <miklos@szeredi.hu> Subject: [PATCH v4 21/21] fuse: Allow user namespace mounts Date: Tue, 26 Apr 2016 14:36:34 -0500 Message-Id: <1461699396-33000-22-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1461699396-33000-1-git-send-email-seth.forshee@canonical.com> References: <1461699396-33000-1-git-send-email-seth.forshee@canonical.com> X-Mailman-Approved-At: Tue, 26 Apr 2016 16:11:02 -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");