| From 2a99a4d488fd9df0dbaf78bf2ed3bf77e583f6b5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 31 Dec 2023 16:12:50 +0900 |
| Subject: ksmbd: Replace one-element array with flexible-array member |
| |
| From: Gustavo A. R. Silva <gustavoars@kernel.org> |
| |
| [ Upstream commit 11d5e2061e973a8d4ff2b95a114b4b8ef8652633 ] |
| |
| One-element arrays are deprecated, and we are replacing them with flexible |
| array members instead. So, replace one-element array with flexible-array |
| member in struct smb_negotiate_req. |
| |
| This results in no differences in binary output. |
| |
| Link: https://github.com/KSPP/linux/issues/79 |
| Link: https://github.com/KSPP/linux/issues/317 |
| 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: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/smb/server/smb_common.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h |
| index f0134d16067fb..f1092519c0c28 100644 |
| --- a/fs/smb/server/smb_common.h |
| +++ b/fs/smb/server/smb_common.h |
| @@ -200,7 +200,7 @@ struct smb_hdr { |
| struct smb_negotiate_req { |
| struct smb_hdr hdr; /* wct = 0 */ |
| __le16 ByteCount; |
| - unsigned char DialectsArray[1]; |
| + unsigned char DialectsArray[]; |
| } __packed; |
| |
| struct smb_negotiate_rsp { |
| -- |
| 2.43.0 |
| |