From patchwork Thu Dec 3 01:14:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 11947403 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8161C6369E for ; Thu, 3 Dec 2020 01:15:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D1F9221FB for ; Thu, 3 Dec 2020 01:15:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726839AbgLCBPt (ORCPT ); Wed, 2 Dec 2020 20:15:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726024AbgLCBPt (ORCPT ); Wed, 2 Dec 2020 20:15:49 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57384C0613D6 for ; Wed, 2 Dec 2020 17:15:09 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id EFE041BE7; Wed, 2 Dec 2020 20:15:00 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org EFE041BE7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fieldses.org; s=default; t=1606958101; bh=6Bi9Zq0zZLKu28AxyDSGdjngTwfi3CSIqfmJUr5KNqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KZkR3XsScig5HR+HgK5DHKtHAI0FJ3yYvZ1v+1FIJjDrKQ09lQfnJRqJjAav7dz9P PF2YwEA1iG2dzzVwpweFfTwn8a2BJyF60fyKxFlCTfZsddYlMGdmsbAYZ+RoL1PNEw R770Jl8KlhFJGEp0yCZor1LC5+AWdFWWEIvYDEAw= From: bfields@fieldses.org To: Steve Dickson Cc: linux-nfs@vger.kernel.org, Trond Myklebust , "J. Bruce Fields" Subject: [PATCH 2/2] mountd: never root squash on the pseudofs Date: Wed, 2 Dec 2020 20:14:57 -0500 Message-Id: <1606958097-9041-2-git-send-email-bfields@fieldses.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1606958097-9041-1-git-send-email-bfields@fieldses.org> References: <20201203010546.GB348347@pick.fieldses.org> <1606958097-9041-1-git-send-email-bfields@fieldses.org> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" As with security flavors and "secure" ports, we tried to code this so that pseudofs directories would inherit root squashing from their children, but it doesn't really work as coded and I'm not sure it's useful. Let's just not root squash. The risk is pretty low since the pseudofs is readonly, and we'd rather not risk failing a mount unnecessarily. Signed-off-by: J. Bruce Fields --- utils/mountd/v4root.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c index 39dd87a94e59..c42ba72380ea 100644 --- a/utils/mountd/v4root.c +++ b/utils/mountd/v4root.c @@ -34,7 +34,7 @@ static nfs_export pseudo_root = { .m_export = { .e_hostname = "*", .e_path = "/", - .e_flags = NFSEXP_READONLY | NFSEXP_ROOTSQUASH + .e_flags = NFSEXP_READONLY | NFSEXP_NOSUBTREECHECK | NFSEXP_FSID | NFSEXP_V4ROOT | NFSEXP_INSECURE_PORT, .e_anonuid = 65534, @@ -60,8 +60,6 @@ set_pseudofs_security(struct exportent *pseudo) struct flav_info *flav; int i; - if ((flags & NFSEXP_ROOTSQUASH) == 0) - pseudo->e_flags &= ~NFSEXP_ROOTSQUASH; for (flav = flav_map; flav < flav_map + flav_map_size; flav++) { struct sec_entry *new;