From patchwork Wed Dec 2 15:40:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 7747891 Return-Path: X-Original-To: patchwork-linux-fsdevel@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 0B0BD9F387 for ; Wed, 2 Dec 2015 15:45:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EA56204E7 for ; Wed, 2 Dec 2015 15:45:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23A1A204E0 for ; Wed, 2 Dec 2015 15:45:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758819AbbLBPpB (ORCPT ); Wed, 2 Dec 2015 10:45:01 -0500 Received: from mail-ig0-f173.google.com ([209.85.213.173]:34560 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932870AbbLBPma (ORCPT ); Wed, 2 Dec 2015 10:42:30 -0500 Received: by igvg19 with SMTP id g19so120494228igv.1 for ; Wed, 02 Dec 2015 07:42:30 -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=2bXD8ZlB3biQUOg1qqelwM0pxf5+YP3ufVslYwP4MGM=; b=z9IlqFd16DCudMjEnC7RFvKSox+mwl7peKZhF6frQ7pbRhAmRTJ34QUE5JAqG6CBKf D5gsdyR0cBAw+mR9BtWfyLWHkgCra6UDPKGMc7vapqJvLdZku3HeO3xvnty8Vs4SZSaq e35+8EjtV86FhGj1Q5/wswF6Kx0E02zcOer5KZCwunkQo1qdK2+WG6GA1TSFpynKsE21 6qN0HktAJd98xzoOhdtdfO/egHoBUicvHZRKOXjtwAqxP2Db3PeGNjKk3O3W5y9JEnT+ fO4uv/Kg2iNn3YGw/meEIR7ym/eqUEqjmOmgw9R3x1sii3zMHWLFnW/aXEeoCsq1G0GM EOjA== 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=2bXD8ZlB3biQUOg1qqelwM0pxf5+YP3ufVslYwP4MGM=; b=DqkYe5qgFNai/UJFKyBkZ1TaNOxxZiMA85qHGCYtAkbdW9ZPK3GHPwOatWc1G6lb1L wWdlxHMvW2iDL8GQ9EI9FLM5SoADCjfFBtj4SFJ1v2D6VsjFgEPkZykyXXnEMp7YL8VJ uEBlmp4uH3iSw7GzpVpbHkJ9Kr9GrPck3mWg6epkSVGYsmHLsvTNBLzPAu6fAATEwnSs 5CM+TRxBQNSPQn2lhuyYn2F7PpOBWCvZFYlTLT+Sas4S+ufnexTT8kkzvvgl6i3MElDp 2KYKnPr9dKFH8XTYzSZz87nFDCCquN1Fu/fqwKPAvozxPQFoyFPgZ5ZdMMyigpHrvTZf HDXw== X-Gm-Message-State: ALoCoQnVExO8vtBGmkvLib2aLm+mrD25xdaKfCwCMFdXQECw3tfH9B55ObCaP6BO6TtBmrarYk6N X-Received: by 10.50.50.179 with SMTP id d19mr4525724igo.91.1449070950153; Wed, 02 Dec 2015 07:42:30 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by smtp.gmail.com with ESMTPSA id l21sm1359740ioe.21.2015.12.02.07.42.29 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 02 Dec 2015 07:42:29 -0800 (PST) From: Seth Forshee To: "Eric W. Biederman" , Alexander Viro Cc: Serge Hallyn , Richard Weinberger , Austin S Hemmelgarn , Miklos Szeredi , linux-bcache@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-kernel@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, Seth Forshee Subject: [PATCH 13/19] fs: Allow superblock owner to access do_remount_sb() Date: Wed, 2 Dec 2015 09:40:13 -0600 Message-Id: <1449070821-73820-14-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> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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 Superblock level remounts are currently restricted to global CAP_SYS_ADMIN, as is the path for changing the root mount to read only on umount. Loosen both of these permission checks to also allow CAP_SYS_ADMIN in any namespace which is privileged towards the userns which originally mounted the filesystem. Signed-off-by: Seth Forshee Acked-by: "Eric W. Biederman" Acked-by: Serge Hallyn --- fs/namespace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index 18fc58760aec..b00a765895e7 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1510,7 +1510,7 @@ static int do_umount(struct mount *mnt, int flags) * Special case for "unmounting" root ... * we just try to remount it readonly. */ - if (!capable(CAP_SYS_ADMIN)) + if (!ns_capable(sb->s_user_ns, CAP_SYS_ADMIN)) return -EPERM; down_write(&sb->s_umount); if (!(sb->s_flags & MS_RDONLY)) @@ -2199,7 +2199,7 @@ static int do_remount(struct path *path, int flags, int mnt_flags, down_write(&sb->s_umount); if (flags & MS_BIND) err = change_mount_flags(path->mnt, flags); - else if (!capable(CAP_SYS_ADMIN)) + else if (!ns_capable(sb->s_user_ns, CAP_SYS_ADMIN)) err = -EPERM; else err = do_remount_sb(sb, flags, data, 0);