Skip to content

Commit 30010c9

Browse files
Tristan Madanismfrench
authored andcommitted
ksmbd: fix out-of-bounds write in smb2_get_ea() EA alignment
smb2_get_ea() applies 4-byte alignment padding via memset() after writing each EA entry. The bounds check on buf_free_len is performed before the value memcpy, but the alignment memset fires unconditionally afterward with no check on remaining space. When the EA value exactly fills the remaining buffer (buf_free_len == 0 after value subtraction), the alignment memset writes 1-3 NUL bytes past the buf_free_len boundary. In compound requests where the response buffer is shared across commands, the first command (e.g., READ) can consume most of the buffer, leaving a tight remainder for the QUERY_INFO EA response. The alignment memset then overwrites past the physical kvmalloc allocation into adjacent kernel heap memory. Add a bounds check before the alignment memset to ensure buf_free_len can accommodate the padding bytes. This is the same bug pattern fixed by commit beef263 ("ksmbd: fix potencial OOB in get_file_all_info() for compound requests") and commit fda9522 ("ksmbd: fix OOB write in QUERY_INFO for compound requests"), both of which added bounds checks before unconditional writes in QUERY_INFO response handlers. Cc: stable@vger.kernel.org Fixes: e2b76ab ("ksmbd: add support for read compound") Signed-off-by: Tristan Madani <tristan@talencesecurity.com> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 299f962 commit 30010c9

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

fs/smb/server/smb2pdu.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4818,6 +4818,8 @@ static int smb2_get_ea(struct ksmbd_work *work, struct ksmbd_file *fp,
48184818
/* align next xattr entry at 4 byte bundary */
48194819
alignment_bytes = ((next_offset + 3) & ~3) - next_offset;
48204820
if (alignment_bytes) {
4821+
if (buf_free_len < alignment_bytes)
4822+
break;
48214823
memset(ptr, '\0', alignment_bytes);
48224824
ptr += alignment_bytes;
48234825
next_offset += alignment_bytes;

0 commit comments

Comments
 (0)