]> git.hungrycats.org Git - linux/commitdiff
ksmbd: fix out-of-bounds read when padding the final compound response
authorIan Bridges <icb@fastmail.org>
Tue, 3 Nov 2026 16:57:47 +0000 (11:57 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:10:53 +0000 (12:10 -0500)
[ Upstream commit 714f27729121d59f103ca4dad7b0c2d1c125cd71 ]

Compound response handling pads the last response of a compound to an
8-byte boundary by growing the final iov and the RFC1002 length.
smb2_allocate_rsp_buf() allocates exactly response_sz. A command can
fill the response buffer to within 7 bytes of its end, for example a
QUERY_INFO whose output is bounded only by the space left. The padding
can then run past the allocation, and ksmbd_tcp_writev() reads those
bytes when it sends the response.

  BUG: KASAN: slab-out-of-bounds in _copy_from_iter+0x744/0x10e0
  Call Trace:
   _copy_from_iter+0x744/0x10e0
   tcp_sendmsg_locked+0x2290/0x3f80
   ksmbd_tcp_writev+0x10c7/0x1ab0 [ksmbd]

Allocate room for the padding when the request is a compound, as
smb2_read() and smb2_read_pipe() do for their payloads. response_sz is
unchanged, so commands still fill only up to it, and kvzalloc() zeroes
the padding.

Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3")
Cc: stable@vger.kernel.org
Signed-off-by: Ian Bridges <icb@fastmail.org>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/smb/server/smb2pdu.c

index e5bbd003e35990ca05ec10b9400992558c0b7448..fa1c8f613ddd8af99d6da6bc654bd99ce9e57acb 100644 (file)
@@ -876,7 +876,7 @@ int smb2_allocate_rsp_buf(struct ksmbd_work *work)
        struct smb_version_values *vals = work->conn->vals;
        size_t small_sz = MAX_CIFS_SMALL_BUFFER_SIZE;
        size_t large_sz = small_sz + vals->max_trans_size;
-       size_t sz = small_sz;
+       size_t sz = small_sz, pad_sz = 0;
        int cmd = le16_to_cpu(hdr->Command);
 
        if (cmd == SMB2_IOCTL_HE || cmd == SMB2_QUERY_DIRECTORY_HE)
@@ -902,10 +902,17 @@ int smb2_allocate_rsp_buf(struct ksmbd_work *work)
        }
 
        /* allocate large response buf for chained commands */
-       if (le32_to_cpu(hdr->NextCommand) > 0)
+       if (le32_to_cpu(hdr->NextCommand) > 0) {
                sz = large_sz;
+               /*
+                * is_chained_smb2_message() pads the last response of a
+                * compound to 8 bytes, which can take it past response_sz.
+                * Leave room for the padding. kvzalloc() zeroes it.
+                */
+               pad_sz = ALIGN(sz - sizeof(__be32), 8) - (sz - sizeof(__be32));
+       }
 
-       work->response_buf = kvzalloc(sz, KSMBD_DEFAULT_GFP);
+       work->response_buf = kvzalloc(sz + pad_sz, KSMBD_DEFAULT_GFP);
        if (!work->response_buf)
                return -ENOMEM;