| From 0a42623ad0e0caf37648e24f283ddee9993423f8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 19 Mar 2025 17:28:58 +0300 |
| Subject: cifs: avoid NULL pointer dereference in dbg call |
| |
| From: Alexandra Diupina <adiupina@astralinux.ru> |
| |
| [ 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 | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c |
| index 12b6684f2d372..b84e682b4cae2 100644 |
| --- a/fs/cifs/smb2misc.c |
| +++ b/fs/cifs/smb2misc.c |
| @@ -788,11 +788,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; |
| } |
| -- |
| 2.39.5 |
| |
