| From 17d5b135bb720832364e8f55f6a887a3c7ec8fdb Mon Sep 17 00:00:00 2001 |
| From: Namjae Jeon <linkinjeon@kernel.org> |
| Date: Fri, 25 Aug 2023 23:39:40 +0900 |
| Subject: ksmbd: fix wrong DataOffset validation of create context |
| |
| From: Namjae Jeon <linkinjeon@kernel.org> |
| |
| commit 17d5b135bb720832364e8f55f6a887a3c7ec8fdb upstream. |
| |
| If ->DataOffset of create context is 0, DataBuffer size is not correctly |
| validated. This patch change wrong validation code and consider tag |
| length in request. |
| |
| Cc: stable@vger.kernel.org |
| Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-21824 |
| Signed-off-by: Namjae Jeon <linkinjeon@kernel.org> |
| Signed-off-by: Steve French <stfrench@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/ksmbd/oplock.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/ksmbd/oplock.c |
| +++ b/fs/ksmbd/oplock.c |
| @@ -1485,7 +1485,7 @@ struct create_context *smb2_find_context |
| name_len < 4 || |
| name_off + name_len > cc_len || |
| (value_off & 0x7) != 0 || |
| - (value_off && (value_off < name_off + name_len)) || |
| + (value_len && value_off < name_off + (name_len < 8 ? 8 : name_len)) || |
| ((u64)value_off + value_len > cc_len)) |
| return ERR_PTR(-EINVAL); |
| |
