From: Haoxiang Li <haoxiang_li2024@163.com>
Date: Mon, 17 Feb 2025 07:20:38 +0000 (+0800)
Subject: smb: client: Add check for next_buffer in receive_encrypted_standard()
X-Git-Tag: v5.10.235~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f277e479eea3d1aa18bc712abe1d2bf3dece2e30;p=thirdparty%2Fkernel%2Fstable.git

smb: client: Add check for next_buffer in receive_encrypted_standard()

[ Upstream commit 860ca5e50f73c2a1cef7eefc9d39d04e275417f7 ]

Add check for the return value of cifs_buf_get() and cifs_small_buf_get()
in receive_encrypted_standard() to prevent null pointer dereference.

Fixes: eec04ea11969 ("smb: client: fix OOB in receive_encrypted_standard()")
Cc: stable@vger.kernel.org
Signed-off-by: Haoxiang Li <haoxiang_li2024@163.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 68f93de2b1527..70a4d101b5428 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -4938,6 +4938,10 @@ one_more:
 			next_buffer = (char *)cifs_buf_get();
 		else
 			next_buffer = (char *)cifs_small_buf_get();
+		if (!next_buffer) {
+			cifs_server_dbg(VFS, "No memory for (large) SMB response\n");
+			return -1;
+		}
 		memcpy(next_buffer, buf + next_cmd, pdu_length - next_cmd);
 	}