* [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
@ 2023-06-21 21:29 Gustavo A. R. Silva
2023-06-21 21:29 ` Kees Cook
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2023-06-21 21:29 UTC (permalink / raw)
To: Namjae Jeon, Steve French, Sergey Senozhatsky, Tom Talpey
Cc: linux-cifs, linux-kernel, Gustavo A. R. Silva, linux-hardening
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>
---
fs/smb/server/smb_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
index a7e81067bc99..b51f431ade01 100644
--- a/fs/smb/server/smb_common.c
+++ b/fs/smb/server/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;
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
2023-06-21 21:29 [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect() Gustavo A. R. Silva
@ 2023-06-21 21:29 ` Kees Cook
2023-06-21 23:37 ` Namjae Jeon
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Kees Cook @ 2023-06-21 21:29 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Namjae Jeon, Steve French, Sergey Senozhatsky, Tom Talpey,
linux-cifs, linux-kernel, linux-hardening
On Wed, Jun 21, 2023 at 03:29:22PM -0600, Gustavo A. R. Silva wrote:
> 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>
--
Kees Cook
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
2023-06-21 21:29 [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect() Gustavo A. R. Silva
2023-06-21 21:29 ` Kees Cook
@ 2023-06-21 23:37 ` Namjae Jeon
2023-06-23 5:00 ` Sergey Senozhatsky
2023-06-24 3:50 ` Namjae Jeon
3 siblings, 0 replies; 5+ messages in thread
From: Namjae Jeon @ 2023-06-21 23:37 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Steve French, Sergey Senozhatsky, Tom Talpey, linux-cifs,
linux-kernel, linux-hardening
2023-06-22 6:29 GMT+09:00, Gustavo A. R. Silva <gustavoars@kernel.org>:
> 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>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
2023-06-21 21:29 [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect() Gustavo A. R. Silva
2023-06-21 21:29 ` Kees Cook
2023-06-21 23:37 ` Namjae Jeon
@ 2023-06-23 5:00 ` Sergey Senozhatsky
2023-06-24 3:50 ` Namjae Jeon
3 siblings, 0 replies; 5+ messages in thread
From: Sergey Senozhatsky @ 2023-06-23 5:00 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Namjae Jeon, Steve French, Sergey Senozhatsky, Tom Talpey,
linux-cifs, linux-kernel, linux-hardening
On (23/06/21 15:29), Gustavo A. R. Silva wrote:
> 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: Sergey Senozhatsky <senozhatsky@chromium.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect()
2023-06-21 21:29 [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect() Gustavo A. R. Silva
` (2 preceding siblings ...)
2023-06-23 5:00 ` Sergey Senozhatsky
@ 2023-06-24 3:50 ` Namjae Jeon
3 siblings, 0 replies; 5+ messages in thread
From: Namjae Jeon @ 2023-06-24 3:50 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Steve French, Sergey Senozhatsky, Tom Talpey, linux-cifs,
linux-kernel, linux-hardening
2023-06-22 6:29 GMT+09:00, Gustavo A. R. Silva <gustavoars@kernel.org>:
> 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>
Applied it with reviewed/acked-by tags to #ksmbd-for-next-next.
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-24 3:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-21 21:29 [PATCH][next] ksmbd: Use struct_size() helper in ksmbd_negotiate_smb_dialect() Gustavo A. R. Silva
2023-06-21 21:29 ` Kees Cook
2023-06-21 23:37 ` Namjae Jeon
2023-06-23 5:00 ` Sergey Senozhatsky
2023-06-24 3:50 ` Namjae Jeon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).