Skip to content

Commit 74c2ab6

Browse files
Su HuiSteve French
authored andcommitted
smb/client: avoid possible NULL dereference in cifs_free_subrequest()
Clang static checker (scan-build) warning: cifsglob.h:line 890, column 3 Access to field 'ops' results in a dereference of a null pointer. Commit 519be98 ("cifs: Add a tracepoint to track credits involved in R/W requests") adds a check for 'rdata->server', and let clang throw this warning about NULL dereference. When 'rdata->credits.value != 0 && rdata->server == NULL' happens, add_credits_and_wake_if() will call rdata->server->ops->add_credits(). This will cause NULL dereference problem. Add a check for 'rdata->server' to avoid NULL dereference. Cc: stable@vger.kernel.org Fixes: 69c3c02 ("cifs: Implement netfslib hooks") Reviewed-by: David Howells <dhowells@redhat.com> Signed-off-by: Su Hui <suhui@nfschina.com> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 7c626ce commit 74c2ab6

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

fs/smb/client/file.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,16 +315,20 @@ static void cifs_free_subrequest(struct netfs_io_subrequest *subreq)
315315
#endif
316316
}
317317

318-
if (rdata->credits.value != 0)
318+
if (rdata->credits.value != 0) {
319319
trace_smb3_rw_credits(rdata->rreq->debug_id,
320320
rdata->subreq.debug_index,
321321
rdata->credits.value,
322322
rdata->server ? rdata->server->credits : 0,
323323
rdata->server ? rdata->server->in_flight : 0,
324324
-rdata->credits.value,
325325
cifs_trace_rw_credits_free_subreq);
326+
if (rdata->server)
327+
add_credits_and_wake_if(rdata->server, &rdata->credits, 0);
328+
else
329+
rdata->credits.value = 0;
330+
}
326331

327-
add_credits_and_wake_if(rdata->server, &rdata->credits, 0);
328332
if (rdata->have_xid)
329333
free_xid(rdata->xid);
330334
}

0 commit comments

Comments
 (0)