From: Gustavo A. R. Silva <gustavoars@kernel.org>
Date: Mon, 18 Dec 2023 15:34:12 +0000 (+0900)
Subject: ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
X-Git-Tag: v5.15.145~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9902ad14f82422c552be893f72fb518cdb751d3;p=thirdparty%2Fkernel%2Fstable.git

ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()

[ Upstream commit 5211cc8727ed9701b04976ab47602955e5641bda ]

Prefer struct_size() over open-coded versions.

Link: https://github.com/KSPP/linux/issues/160
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/ksmbd/smb_common.c b/fs/ksmbd/smb_common.c
index 08d95e1ecc5ee..f7c907143834f 100644
--- a/fs/ksmbd/smb_common.c
+++ b/fs/ksmbd/smb_common.c
@@ -266,7 +266,7 @@ static int ksmbd_negotiate_smb_dialect(void *buf)
 		if (smb2_neg_size > smb_buf_length)
 			goto err_out;
 
-		if (smb2_neg_size + le16_to_cpu(req->DialectCount) * sizeof(__le16) >
+		if (struct_size(req, Dialects, le16_to_cpu(req->DialectCount)) >
 		    smb_buf_length)
 			goto err_out;