Skip to contentSkip to conversation

nfsd: fix use-after-free in nfsd_file_do_acquire tracepoint

PATCH Applied Jeff Layton 2 participants 2 messages Nov 5, 2022

Subsystems (2)
lore
Share & tools
lore

Jeff Layton

author maintainer
#0 lore raw

PATCH 1/1 nfsd: fix use-after-free in nfsd_file_do_acquire tracepoint

When we fail to insert into the hashtable with a non-retryable error, we'll free the object and then goto out_status. If the tracepoint is enabled, it'll end up accessing the freed object when it tries to grab the fields out of it.

Set nf to NULL after freeing it to avoid the issue.

Fixes 243a5263014a ("nfsd: rework hashtable handling in nfsd_do_file_acquire")
---
 fs/nfsd/filecache.c | 1 +
 1 file changed, 1 insertion(+)
fs/nfsd/filecache.c +1 -0
index 687ab814b678..02c1454dfe50 100644
@@ -1124,6 +1124,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,
 		goto open_file;
 
 	nfsd_file_slab_free(&nf->nf_rcu);
+	nf = NULL;
 	if (ret == -EEXIST)
 		goto retry;
 	trace_nfsd_file_insert_err(rqstp, key.inode, may_flags, ret);
Signature · 1 line
2.38.1
#1 lore raw
Quoted 11 lines · Jeff Layton

When we fail to insert into the hashtable with a non-retryable error, we'll free the object and then goto out_status. If the tracepoint is enabled, it'll end up accessing the freed object when it tries to grab the fields out of it.

Set nf to NULL after freeing it to avoid the issue.

Quoted 7 lines
Fixes 243a5263014a ("nfsd: rework hashtable handling in nfsd_do_file_acquire")

---
fs/nfsd/filecache.c | 1 +

1 file changed, 1 insertion(+)

I've applied this to nfsd's for-rc. Thank you!

Quoted 15 lines
fs/nfsd/filecache.c +1 -0
index 687ab814b678..02c1454dfe50 100644
@@ -1124,6 +1124,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,
 		goto open_file;
 
 	nfsd_file_slab_free(&nf->nf_rcu);
+	nf = NULL;
 	if (ret == -EEXIST)
 		goto retry;
 	trace_nfsd_file_insert_err(rqstp, key.inode, may_flags, ret);
Signature · 1 line
2.38.1

--
Chuck Lever