From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 DC17EC56201 for ; Thu, 12 Nov 2020 10:10:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8644022201 for ; Thu, 12 Nov 2020 10:10:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=sargun.me header.i=@sargun.me header.b="f/FCgDAP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727907AbgKLKK0 (ORCPT ); Thu, 12 Nov 2020 05:10:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727875AbgKLKKV (ORCPT ); Thu, 12 Nov 2020 05:10:21 -0500 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84710C0613D6 for ; Thu, 12 Nov 2020 02:10:19 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id v12so4043230pfm.13 for ; Thu, 12 Nov 2020 02:10:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sargun.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HwBTug+23umF28NOUuY72jHdkiXAQf5/pampIt7rm+0=; b=f/FCgDAPg3mfdDCjfy71ryP/hWtUQJNJ7T+gmydKdG95040KitzidkH2AYuLXZuA9P tHip4qbqzxoqWvSHCUV0qMyydFKRNS1nMaVj3uH4yF9iilbUU85jczoPNOr8/t2xxqZs HQ8KW0cuWxYYLlQgRTGmbaqT1KE7Z9qtCwalI= 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:mime-version:content-transfer-encoding; bh=HwBTug+23umF28NOUuY72jHdkiXAQf5/pampIt7rm+0=; b=uiPNFle2iZzROFTxUOoJeBS4lgrqZUXj19U8ZLqpLB9wmWBql3X3KLwyBJI4o4r6If i2ywYYxGQ03QaTfnjS/taMhe1UmJ9TRzTb9ppUF0HX5rWFOkJ2FtwJnvErUHf0xCophA dpFeE+6rwXVCAduzSIk8SqXuai8d4p835fYpYQmU5hSnwkLWfaSVIrCJS4Gks8mYwEhs DOERsRdb4LCVcDQ5yWDglMgQEavnHGxhG42eVx+bUnxRXyCchnx0FjcFGe9TbSScm5NL af3Lux1XFovzItuoqRdc4gVQvzmLevHtTUZ7oIazrXggKXdzAD8iUAQtHzwIYiFDh6XN kzvQ== X-Gm-Message-State: AOAM531fBvoqkfZgND8tehFElxZeZLJgVwoYSffofbbExNemVBCLNC2u w/mb2uxkFedVJ2xJ6B9byQpvqg== X-Google-Smtp-Source: ABdhPJxKsI86xum8d5jkMs9uEYgnOC5aQTE4UvTzZiFlEp6gDjWmAC2oYsoDrPCFjQpENuC1k+Kjfw== X-Received: by 2002:a17:90a:648b:: with SMTP id h11mr8573948pjj.221.1605175818836; Thu, 12 Nov 2020 02:10:18 -0800 (PST) Received: from ubuntu.netflix.com (203.20.25.136.in-addr.arpa. [136.25.20.203]) by smtp.gmail.com with ESMTPSA id n1sm5577060pfu.211.2020.11.12.02.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 02:10:18 -0800 (PST) From: Sargun Dhillon To: "J . Bruce Fields" , Chuck Lever , Trond Myklebust , Anna Schumaker , David Howells , Scott Mayhew Cc: mauricio@kinvolk.io, Alban Crequy , Sargun Dhillon , linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Kyle Anderson Subject: [PATCH v5 1/2] NFS: NFSv2/NFSv3: Use cred from fs_context during mount Date: Thu, 12 Nov 2020 02:09:51 -0800 Message-Id: <20201112100952.3514-2-sargun@sargun.me> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112100952.3514-1-sargun@sargun.me> References: <20201112100952.3514-1-sargun@sargun.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There was refactoring done to use the fs_context for mounting done in: 62a55d088cd87: NFS: Additional refactoring for fs_context conversion This made it so that the net_ns is fetched from the fs_context (the netns that fsopen is called in). This change also makes it so that the credential fetched during fsopen is used as well as the net_ns. NFS has already had a number of changes to prepare it for user namespaces: 1a58e8a0e5c1: NFS: Store the credential of the mount process in the nfs_server 264d948ce7d0: NFS: Convert NFSv3 to use the container user namespace c207db2f5da5: NFS: Convert NFSv2 to use the container user namespace Previously, different credentials could be used for creation of the fs_context versus creation of the nfs_server, as FSCONFIG_CMD_CREATE did the actual credential check, and that's where current_creds() were fetched. This meant that the user namespace which fsopen was called in could be a non-init user namespace. This still requires that the user that calls FSCONFIG_CMD_CREATE has CAP_SYS_ADMIN in the init user ns. This roughly allows a privileged user to mount on behalf of an unprivileged usernamespace, by forking off and calling fsopen in the unprivileged user namespace. It can then pass back that fsfd to the privileged process which can configure the NFS mount, and then it can call FSCONFIG_CMD_CREATE before switching back into the mount namespace of the container, and finish up the mounting process and call fsmount and move_mount. Signed-off-by: Sargun Dhillon Tested-by: Alban Crequy --- fs/nfs/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 4b8cc93913f7..1e6f3b3ed445 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -571,7 +571,7 @@ static int nfs_start_lockd(struct nfs_server *server) 1 : 0, .net = clp->cl_net, .nlmclnt_ops = clp->cl_nfs_mod->rpc_ops->nlmclnt_ops, - .cred = current_cred(), + .cred = server->cred, }; if (nlm_init.nfs_version > 3) @@ -985,7 +985,7 @@ struct nfs_server *nfs_create_server(struct fs_context *fc) if (!server) return ERR_PTR(-ENOMEM); - server->cred = get_cred(current_cred()); + server->cred = get_cred(fc->cred); error = -ENOMEM; fattr = nfs_alloc_fattr(); -- 2.25.1