diff options
| author | Namjae Jeon <linkinjeon@kernel.org> | 2023-08-25 23:39:40 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-09-06 21:26:59 +0100 |
| commit | 7d8855fd849d9c3186a9e1d3085ea4aedc6e019f (patch) | |
| tree | 0f4d10574f541d1b40199314aab1feff8ebab4e2 /fs | |
| parent | 1ce9ebc96eda5556e5a15bbe6a17b293841af29e (diff) | |
| download | linux-7d8855fd849d9c3186a9e1d3085ea4aedc6e019f.tar.gz | |
ksmbd: fix wrong DataOffset validation of create context
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/smb/server/oplock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c index 4b210cdd7556..c81aee9ce7ec 100644 --- a/fs/smb/server/oplock.c +++ b/fs/smb/server/oplock.c @@ -1492,7 +1492,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); |