UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd: only fill out return pointer on success in nfsd4_lookup_stateid 

In the case of a revoked delegation, we still fill out the pointer even
when returning an error, which is bad form. Only overwrite the pointer
on success.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Jeff Layton 2022-09-26 12:38:44 -04:00 committed by Chuck Lever
parent 019805fea9
commit 4d01416ab4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfsd/nfs4state.c
View File

@ -6266,6 +6266,7 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
struct nfs4_stid **s, struct nfsd_net *nn) struct nfs4_stid **s, struct nfsd_net *nn)
{ {
__be32 status; __be32 status;
struct nfs4_stid *stid;
bool return_revoked = false; bool return_revoked = false;
/* /*
@ -6288,15 +6289,16 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
} }
if (status) if (status)
return status; return status;
*s = find_stateid_by_type(cstate->clp, stateid, typemask); stid = find_stateid_by_type(cstate->clp, stateid, typemask);
if (!*s) if (!stid)
return nfserr_bad_stateid; return nfserr_bad_stateid;
if (((*s)->sc_type == NFS4_REVOKED_DELEG_STID) && !return_revoked) { if ((stid->sc_type == NFS4_REVOKED_DELEG_STID) && !return_revoked) {
nfs4_put_stid(*s); nfs4_put_stid(stid);
if (cstate->minorversion) if (cstate->minorversion)
return nfserr_deleg_revoked; return nfserr_deleg_revoked;
return nfserr_bad_stateid; return nfserr_bad_stateid;
} }
*s = stid;
return nfs_ok; return nfs_ok;
} }