From: Namjae Jeon Date: Fri, 25 Aug 2023 14:39:40 +0000 (+0900) Subject: ksmbd: fix wrong DataOffset validation of create context X-Git-Tag: v6.6-rc1~109^2~3 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=17d5b135bb720832364e8f55f6a887a3c7ec8fdb;p=linux-block.git ksmbd: fix wrong DataOffset validation of create context 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 Signed-off-by: Steve French --- diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c index 6bc8a1e48171..9bc0103720f5 100644 --- a/fs/smb/server/oplock.c +++ b/fs/smb/server/oplock.c @@ -1481,7 +1481,7 @@ struct create_context *smb2_find_context_vals(void *open_req, const char *tag, i 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);