NFSD: Fix crash in nfsd4_read_release()

chucklever · chucklever · commit abb1f08a2121 · 2025-10-21T11:03:19.000-04:00
When tracing is enabled, the trace_nfsd_read_done trace point crashes during the pynfs read.testNoFh test. Fixes: 15a8b55 ("nfsd: call op_release, even when op_func returns an error") Cc: stable@vger.kernel.org Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
@@ -988,10 +988,11 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 static void
 nfsd4_read_release(union nfsd4_op_u *u)
 {
-	if (u->read.rd_nf)
+	if (u->read.rd_nf) {
+		trace_nfsd_read_done(u->read.rd_rqstp, u->read.rd_fhp,
+				     u->read.rd_offset, u->read.rd_length);
 		nfsd_file_put(u->read.rd_nf);
-	trace_nfsd_read_done(u->read.rd_rqstp, u->read.rd_fhp,
-			     u->read.rd_offset, u->read.rd_length);
+	}
 }
 
 static __be32

Original file line number	Diff line number	Diff line change
`@@ -988,10 +988,11 @@ nfsd4_read(struct svc_rqst rqstp, struct nfsd4_compound_state cstate,`
`988`	`988`	`static void`
`989`	`989`	`nfsd4_read_release(union nfsd4_op_u *u)`
`990`	`990`	`{`
`991`		`- if (u->read.rd_nf)`
	`991`	`+ if (u->read.rd_nf) {`
	`992`	`+ trace_nfsd_read_done(u->read.rd_rqstp, u->read.rd_fhp,`
	`993`	`+ u->read.rd_offset, u->read.rd_length);`
`992`	`994`	`nfsd_file_put(u->read.rd_nf);`
`993`		`- trace_nfsd_read_done(u->read.rd_rqstp, u->read.rd_fhp,`
`994`		`- u->read.rd_offset, u->read.rd_length);`
	`995`	`+ }`
`995`	`996`	`}`
`996`	`997`
`997`	`998`	`static __be32`