From patchwork Fri Dec 22 14:32:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongsu Park X-Patchwork-Id: 10130549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F250060318 for ; Fri, 22 Dec 2017 14:31:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9F5029FA9 for ; Fri, 22 Dec 2017 14:31:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DEA2729FE9; Fri, 22 Dec 2017 14:31:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F39F29FE4 for ; Fri, 22 Dec 2017 14:31:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756218AbdLVObc (ORCPT ); Fri, 22 Dec 2017 09:31:32 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:37690 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755458AbdLVObZ (ORCPT ); Fri, 22 Dec 2017 09:31:25 -0500 Received: by mail-wm0-f67.google.com with SMTP id f140so21954975wmd.2 for ; Fri, 22 Dec 2017 06:31:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kinvolk.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EuFgsRNi9rUM2RfeCQbpWQg8WOSOXVx24q8kGI8OIJs=; b=kNLTq1vqVlRD8yfjtMx4eCRLtdtiUT7t7eY1EoMJR+utuKYjwcIIKv/DokK2l5SNw1 Q6PFzL8eTIjkzB1PwcRG8WfEHsub7JDUAgF5m3dwSnUo5DWTHH3xiIcqasX1qipH7CsH M5/lK91ZVwpGg26Blbu3VtGicD+IdcurfuHIg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EuFgsRNi9rUM2RfeCQbpWQg8WOSOXVx24q8kGI8OIJs=; b=ar8PwaxlRLF6P7jCnmm54WGSnug33BwqpJvkvXYW5Csx/DnN9bRG8FXOtdzFqx3wgk ndVC42U5pF5PGGQyFjOwzi9ADsvhO1SH2sGOuCBRplk3D2yzUk5nZrvif0E33ETsFxP2 apdyFkC6WjmESQJqVBdP13vExtEV6lpULUsCxekYGmrkZIaSGVGMbC5HUlnxII0HqWRx Whay5pIL8zUqLRZDLphH+8VbpZXGII+mAuzErEuLODAtDYdxV1B9jTu4bH3ACAxnX3t3 0ErlUqIpT1uKXQR65LNWRKOLykcAGAszQmi7P79avYQmPUIVyvIC2bmeSFg1V1LYmJPR TITw== X-Gm-Message-State: AKGB3mJxDbIZuJ5anTZ96I5XVEfJFCM8A0r2UtBuzYvybYYfN9IqEhcb aXNo4sOdrhARq0V5RJgi1afc6w== X-Google-Smtp-Source: ACJfBou3X6J4nKynDCnAooY9FifYFf8mk2mte1SD2joCjI7kh7hshEfo+/kjRLRsg0fTwQYnkE1yNg== X-Received: by 10.80.134.197 with SMTP id 5mr15566720edu.129.1513953084601; Fri, 22 Dec 2017 06:31:24 -0800 (PST) Received: from dberlin.localdomain ([178.19.216.175]) by smtp.gmail.com with ESMTPSA id j39sm19698065ede.38.2017.12.22.06.31.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Dec 2017 06:31:24 -0800 (PST) From: Dongsu Park To: linux-kernel@vger.kernel.org Cc: containers@lists.linux-foundation.org, Alban Crequy , "Eric W . Biederman" , Miklos Szeredi , Seth Forshee , Sargun Dhillon , Dongsu Park , linux-fsdevel@vger.kernel.org, Alexander Viro , Serge Hallyn Subject: [PATCH 05/11] fs: Allow superblock owner to access do_remount_sb() Date: Fri, 22 Dec 2017 15:32:29 +0100 Message-Id: <8dd484dceb9e96e5b67f21b8a0cf333753985e89.1512041070.git.dongsu@kinvolk.io> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Seth Forshee 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. Patch v4 is available: https://patchwork.kernel.org/patch/8944631/ Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Alexander Viro Cc: "Eric W. Biederman" Cc: Serge Hallyn Signed-off-by: Seth Forshee Signed-off-by: Dongsu Park 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 e158ec6b..830040d7 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1589,7 +1589,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_rdonly(sb)) @@ -2327,7 +2327,7 @@ static int do_remount(struct path *path, int ms_flags, int sb_flags, down_write(&sb->s_umount); if (ms_flags & MS_BIND) err = change_mount_flags(path->mnt, ms_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, sb_flags, data, 0);