diff options
| author | Namjae Jeon <linkinjeon@kernel.org> | 2024-03-16 23:36:36 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-03 15:11:29 +0200 |
| commit | 3b8da67191e938a63d2736dabb4ac5d337e5de57 (patch) | |
| tree | 916530854960a6bdd8efe31b7f5dcec946c5ad2e /fs | |
| parent | 956aa592f05abd2ccd499cee9da0057f9c0c264f (diff) | |
| download | linux-stable-3b8da67191e938a63d2736dabb4ac5d337e5de57.tar.gz linux-stable-3b8da67191e938a63d2736dabb4ac5d337e5de57.tar.bz2 linux-stable-3b8da67191e938a63d2736dabb4ac5d337e5de57.zip | |
ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
[ Upstream commit a80a486d72e20bd12c335bcd38b6e6f19356b0aa ]
If ->NameOffset of smb2_create_req is smaller than Buffer offset of
smb2_create_req, slab-out-of-bounds read can happen from smb2_open.
This patch set the minimum value of the name offset to the buffer offset
to validate name length of smb2_create_req().
Cc: stable@vger.kernel.org
Reported-by: Xuanzhe Yu <yuxuanzhe@outlook.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/smb/server/smb2misc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/smb/server/smb2misc.c b/fs/smb/server/smb2misc.c index 03dded29a980..7c872ffb4b0a 100644 --- a/fs/smb/server/smb2misc.c +++ b/fs/smb/server/smb2misc.c @@ -107,7 +107,10 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, case SMB2_CREATE: { unsigned short int name_off = - le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset); + max_t(unsigned short int, + le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset), + offsetof(struct smb2_create_req, Buffer)); + unsigned short int name_len = le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength); |