xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: allow nfsd_file_get to sanely handle a NULL pointer

Browse Source 
[ Upstream commit 70f62231cdfd52357836733dd31db787e0412ab2 ]

...and remove some now-useless NULL pointer checks in its callers.

Suggested-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jeff Layton
2023-01-06 10:33:47 -05:00
committed by Greg Kroah-Hartman
parent 9d7608dc4b
commit 3c7b9b3487
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfsd/filecache.c
View File

@@ -451,7 +451,7 @@ static bool nfsd_file_lru_remove(struct nfsd_file *nf)
struct nfsd_file * struct nfsd_file *
nfsd_file_get(struct nfsd_file *nf) nfsd_file_get(struct nfsd_file *nf)
{ {
if (likely(refcount_inc_not_zero(&nf->nf_ref))) if (nf && refcount_inc_not_zero(&nf->nf_ref))
return nf; return nf;
return NULL; return NULL;
} }
@@ -1106,8 +1106,7 @@ retry:
rcu_read_lock(); rcu_read_lock();
nf = rhashtable_lookup(&nfsd_file_rhash_tbl, &key, nf = rhashtable_lookup(&nfsd_file_rhash_tbl, &key,
nfsd_file_rhash_params); nfsd_file_rhash_params);
if (nf) nf = nfsd_file_get(nf);
nf = nfsd_file_get(nf);
rcu_read_unlock(); rcu_read_unlock();
if (nf) { if (nf) {

4
fs/nfsd/nfs4state.c
View File

@@ -602,9 +602,7 @@ put_nfs4_file(struct nfs4_file *fi)
static struct nfsd_file * static struct nfsd_file *
__nfs4_get_fd(struct nfs4_file *f, int oflag) __nfs4_get_fd(struct nfs4_file *f, int oflag)
{ {
if (f->fi_fds[oflag]) return nfsd_file_get(f->fi_fds[oflag]);
return nfsd_file_get(f->fi_fds[oflag]);
return NULL;
} }
static struct nfsd_file * static struct nfsd_file *