Skip to content

Commit f9bbe0c

Browse files
committed
Merge tag 'nfsd-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever: - Fix an export leak - Fix a potential tracepoint crash * tag 'nfsd-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: nfsd: put the export reference in nfsd4_verify_deleg_dentry nfsd: fix use-after-free in nfsd_file_do_acquire tracepoint
2 parents e2559b7 + 50256e4 commit f9bbe0c

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

fs/nfsd/filecache.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,
10761076
goto open_file;
10771077

10781078
nfsd_file_slab_free(&nf->nf_rcu);
1079+
nf = NULL;
10791080
if (ret == -EEXIST)
10801081
goto retry;
10811082
trace_nfsd_file_insert_err(rqstp, key.inode, may_flags, ret);

fs/nfsd/nfs4state.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5382,6 +5382,7 @@ nfsd4_verify_deleg_dentry(struct nfsd4_open *open, struct nfs4_file *fp,
53825382
if (err)
53835383
return -EAGAIN;
53845384

5385+
exp_put(exp);
53855386
dput(child);
53865387
if (child != file_dentry(fp->fi_deleg_file->nf_file))
53875388
return -EAGAIN;

0 commit comments

Comments
 (0)