]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cifs: avoid NULL pointer dereference in dbg call
authorAlexandra Diupina <adiupina@astralinux.ru>
Wed, 19 Mar 2025 14:28:58 +0000 (17:28 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 May 2025 05:41:13 +0000 (07:41 +0200)
[ Upstream commit b4885bd5935bb26f0a414ad55679a372e53f9b9b ]

cifs_server_dbg() implies server to be non-NULL so
move call under condition to avoid NULL pointer dereference.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: e79b0332ae06 ("cifs: ignore cached share root handle closing errors")
Cc: stable@vger.kernel.org
Signed-off-by: Alexandra Diupina <adiupina@astralinux.ru>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/cifs/smb2misc.c

index d21b27e68f2a8f457357c76891841386b2fff13c..c0b80ba8875afa4a60d8f955b8c71eabb85d6bb5 100644 (file)
@@ -809,11 +809,12 @@ smb2_handle_cancelled_close(struct cifs_tcon *tcon, __u64 persistent_fid,
                WARN_ONCE(tcon->tc_count < 0, "tcon refcount is negative");
                spin_unlock(&cifs_tcp_ses_lock);
 
-               if (tcon->ses)
+               if (tcon->ses) {
                        server = tcon->ses->server;
-
-               cifs_server_dbg(FYI, "tid=0x%x: tcon is closing, skipping async close retry of fid %llu %llu\n",
-                               tcon->tid, persistent_fid, volatile_fid);
+                       cifs_server_dbg(FYI,
+                                       "tid=0x%x: tcon is closing, skipping async close retry of fid %llu %llu\n",
+                                       tcon->tid, persistent_fid, volatile_fid);
+               }
 
                return 0;
        }