From patchwork Fri Apr 22 15:38:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 8913021 Return-Path: X-Original-To: patchwork-linux-fsdevel@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 07904BF29F for ; Fri, 22 Apr 2016 15:41:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3ADBF201EF for ; Fri, 22 Apr 2016 15:41:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 913B8200C6 for ; Fri, 22 Apr 2016 15:41:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932385AbcDVPlF (ORCPT ); Fri, 22 Apr 2016 11:41:05 -0400 Received: from mail-oi0-f47.google.com ([209.85.218.47]:33728 "EHLO mail-oi0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932273AbcDVPje (ORCPT ); Fri, 22 Apr 2016 11:39:34 -0400 Received: by mail-oi0-f47.google.com with SMTP id r78so120784021oie.0 for ; 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=TElleJM26xwppkJJ8OLSO0HknelySdXIDobCNOhC6/pl4IDhoFGju/o0j/UHDtwvX8 AVFhl5ExXJsR5dPucBblqvhrxCRBElIMOr7N2yQeSPtvgmSxx3r2c8iwYxyzzN+M/poo dZo/1Y/UoCzYEVoKoIWvRK4Dp2ejkDYQVyqGm41i0RYk7n4f6a8bko6TiroH25QCrYzI WpJmPZKBe9rvYjOdPJ5bwOjTzaja7fiI7MKEXsA7+z2hkaGz53kbxDLwzP3KEfcoOBaA uzI1t394apuc8S5X/1bgfOXFpdu4DdpYMARm9073XqCVKlSyqGZC4hWbsv+j7c9F8EnX IqAw== X-Gm-Message-State: AOPr4FUxhmiKMxnk3Brqh0vVglvabUpMxpWj7znjQA9ka+LIHts9/FkcdFZD+kFGLXMqCzT2 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 To: "Eric W. Biederman" , Miklos Szeredi Cc: Alexander Viro , Serge Hallyn , Richard Weinberger , Austin S Hemmelgarn , Miklos Szeredi , Pavel Tikhomirov , linux-kernel@vger.kernel.org, linux-bcache@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, fuse-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, cgroups@vger.kernel.org, Seth Forshee 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> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.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 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");