From patchwork Sun Jun 30 16:37:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Snitzer X-Patchwork-Id: 13717209 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8420F2576F for ; Sun, 30 Jun 2024 16:37:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719765471; cv=none; b=Of/42hyl9MpZQgwVQ9ZRqFhuOhrWGznbrBTi8ns9wB7YVcHB2WDLRk77Z09LpNZHmQoDNVUKA9PwiSFuzzbyYagtL/tGL6c04DYT9xYXkiNWMhZWoXcYV+4nsTcFwc3ynow0mBkUTsrHfLkZZ4TzboM7ZAcogxzmZjhIXXtdii4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719765471; c=relaxed/simple; bh=+bABhOiXZ0VuNJdYVsK1jlsjHSJKy41flP0IxMoIc2E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pd/+hl88E8qzwMqB0UpEL+urdJD2ruAWdn+TN+sQAHJLdXXlQ+F33vo6V24HQlGgc1hwuQXe68DEufb4I87Hn5jM0QwuKw6s0OGVlCgsDVCo8Qxpb2kgQ8zmiCpJD1u7CATX6e9AnrLJksCZxuJ+lLYoe2Tv8VcDQjHdC8Cuuhk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ph1hnRVy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ph1hnRVy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECD9DC2BD10; Sun, 30 Jun 2024 16:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719765471; bh=+bABhOiXZ0VuNJdYVsK1jlsjHSJKy41flP0IxMoIc2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ph1hnRVym98myOkCHQYqUZ6grHHBAcFVjtw9AW+bBo5EmKtl+PgbBeVFFed7eaJ6c bjBz/fsj6pGbli8ensmGJ+UOSh3vAMQbQzG3fTZG8lK8FmArzN+JOVjDbHGs3IqoJK tQOVaaK6W7fCW/3OS5vAS97/8lH9x3ixCfc+eiV63xt5Mdn4og/92aO10Br4xFJVT9 DZzKyqCzoJxj48bqEW07mMw8F7xjN7LJ9WXymKeBkSP7SQ1D0gm7e2Jznuwx0ugYeA bpSBo+X451TBUgpD+LxsMvELF5xQz9tT79yIu0rU9rbz7V/DB7FVlqCXL96OucTBeX TY1OC4NcCvNBA== From: Mike Snitzer To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Chuck Lever , Anna Schumaker , Trond Myklebust , NeilBrown , snitzer@hammerspace.com Subject: [PATCH v10 06/19] nfsd: manage netns reference in nfsd_open_local_fh Date: Sun, 30 Jun 2024 12:37:28 -0400 Message-ID: <20240630163741.48753-7-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240630163741.48753-1-snitzer@kernel.org> References: <20240630163741.48753-1-snitzer@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use maybe_get_net() and put_net() in nfsd_open_local_fh(). Also refactor nfsd_open_local_fh() slightly. Signed-off-by: Mike Snitzer --- fs/nfsd/localio.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/fs/nfsd/localio.c b/fs/nfsd/localio.c index 2eedeaeab533..0f81c340acc5 100644 --- a/fs/nfsd/localio.c +++ b/fs/nfsd/localio.c @@ -99,16 +99,11 @@ nfsd_local_fakerqst_destroy(struct svc_rqst *rqstp) static struct svc_rqst * nfsd_local_fakerqst_create(struct net *net, struct rpc_clnt *rpc_clnt, - const struct cred *cred) + const struct cred *cred, struct svc_serv *serv) { - struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct svc_rqst *rqstp; int status; - /* FIXME: not running in nfsd context, must get reference on nfsd_serv */ - if (unlikely(!READ_ONCE(nn->nfsd_serv))) - return ERR_PTR(-ENXIO); - rqstp = kzalloc(sizeof(*rqstp), GFP_KERNEL); if (!rqstp) return ERR_PTR(-ENOMEM); @@ -118,10 +113,10 @@ nfsd_local_fakerqst_create(struct net *net, struct rpc_clnt *rpc_clnt, status = -ENOMEM; goto out_err; } - rqstp->rq_xprt->xpt_net = net; + __set_bit(RQ_SECURE, &rqstp->rq_flags); - rqstp->rq_server = nn->nfsd_serv; + rqstp->rq_server = serv; /* * These constants aren't actively used in this fake svc_rqst, * which bypasses SUNRPC, but they must pass negative checks. @@ -195,26 +190,39 @@ int nfsd_open_local_fh(struct net *cl_nfssvc_net, { int mayflags = NFSD_MAY_LOCALIO; int status = 0; + struct nfsd_net *nn; const struct cred *save_cred; struct svc_rqst *rqstp; struct svc_fh fh; struct nfsd_file *nf; + struct svc_serv *serv; __be32 beres; + if (nfs_fh->size > NFS4_FHSIZE) + return -EINVAL; + + /* Not running in nfsd context, must safely get reference on nfsd_serv */ + cl_nfssvc_net = maybe_get_net(cl_nfssvc_net); + if (!cl_nfssvc_net) + return -ENXIO; + nn = net_generic(cl_nfssvc_net, nfsd_net_id); + + serv = READ_ONCE(nn->nfsd_serv); + if (unlikely(!serv)) { + status = -ENXIO; + goto out_net; + } + /* Save creds before calling into nfsd */ save_cred = get_current_cred(); - rqstp = nfsd_local_fakerqst_create(cl_nfssvc_net, rpc_clnt, cred); + rqstp = nfsd_local_fakerqst_create(cl_nfssvc_net, rpc_clnt, cred, serv); if (IS_ERR(rqstp)) { status = PTR_ERR(rqstp); goto out_revertcred; } /* nfs_fh -> svc_fh */ - if (nfs_fh->size > NFS4_FHSIZE) { - status = -EINVAL; - goto out; - } fh_init(&fh, NFS4_FHSIZE); fh.fh_handle.fh_size = nfs_fh->size; memcpy(fh.fh_handle.fh_raw, nfs_fh->data, nfs_fh->size); @@ -229,17 +237,15 @@ int nfsd_open_local_fh(struct net *cl_nfssvc_net, status = nfs_stat_to_errno(be32_to_cpu(beres)); goto out_fh_put; } - *pfilp = get_file(nf->nf_file); - nfsd_file_put(nf); out_fh_put: fh_put(&fh); - -out: nfsd_local_fakerqst_destroy(rqstp); out_revertcred: revert_creds(save_cred); +out_net: + put_net(cl_nfssvc_net); return status; } EXPORT_SYMBOL_GPL(nfsd_open_local_fh);