From: Steve French <stfrench@microsoft.com>
Date: Tue, 24 May 2022 01:54:04 +0000 (-0500)
Subject: smb3: don't set rc when used and unneeded in query_info_compound
X-Git-Tag: v5.19-rc1~113^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ccfc23a72b669678e4c9ccba98d3d91db1c04cf;p=thirdparty%2Fkernel%2Flinux.git

smb3: don't set rc when used and unneeded in query_info_compound

rc is not checked so should not be set coming back from open_cached_dir
(the cfid pointer is checked instead to see if open_cached_dir failed)

Addresses-Coverity: 1518021 ("Code maintainability issues  (UNUSED_VALUE)")
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
---

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 0d7feb9e609e2..ed2f8a69658dc 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -2700,7 +2700,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
 	memset(rsp_iov, 0, sizeof(rsp_iov));
 
 	if (!strcmp(path, ""))
-		rc = open_cached_dir(xid, tcon, path, cifs_sb, &cfid);
+		open_cached_dir(xid, tcon, path, cifs_sb, &cfid); /* cfid null if open dir failed */
 
 	memset(&open_iov, 0, sizeof(open_iov));
 	rqst[0].rq_iov = open_iov;