From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794361842; b=zlaXNQ07nT8HwNmZkDI5HesM+5ikpEAPU4QAnNJLM9yp5MTyp+UWInu6r0SsRcEJP/Lm D5KROu1W6hdGuRSc0EU0x+97533Po31e/79eYnjeAkIS5kJbvmLulwRCpKUclh2kZunT3 ZBpO0qaI/41CvNiUPpCvK1BVJ6RU0TUFWQoQ3EdwYmZ7h43FCvyEW1TQKDXG4+vEEYnP/ HiotcjK8+mIDzbJHlo1YquDExqcnOpHPbfw/9BxD4DJkLNolAMJk2tX/SOy9fsMOZtmBW kjWMjCKeVO1a6ek/VxD+QZs57qCI+H4vVCymaomR+Dig37158wz5S7eN0wimAEPEg7g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794361842; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=tDTW8Kqh5Q0ZtVpGvocaozwKeH8HWmWn7vFD0leBJj4=; b=Q2WEIHOeJUjhyC+4E0UQqXdpZIqAUd/jeq4XMYjNpu9RYsdsniOJM/OWi8bnq7QMRaGa Atoq2rzZ/UiTmq8a/fWaD1jCkqtYXXaM0G1AZiY6eg+GKfCnG2f3S0/hsNpeBqmn5h8+T cqTj9ccmkVmkZ8DS57RXkVF5ZsGD2TaR5xzyr9XIro5aVhYGdi43WVTBGdQeKETiaBDge q4ff3gwWl7L7d/a5x29xoyBAF6/jrwcFpMXCci7HehBSeBF9vob2EuPzRSSNkmAemDssm y7CJdnApTllVHQdc1sqH+TJIYdEhPMiG9dzUPkec0z7nhG5VnB7OFT2N8fftk/DYnUw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=YUma6VS5; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EA25606A321 for ; Wed, 11 Nov 2026 01:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=YUma6VS5 Received: by smtp.kernel.org (Postfix) with ESMTPSA id F13781F0089F; Wed, 11 Nov 2026 01:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794361841; bh=tDTW8Kqh5Q0ZtVpGvocaozwKeH8HWmWn7vFD0leBJj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YUma6VS5QlBg/iNGOOXoUyZCHMj5Bet2naNbmU1U4fp0pGnrRWuRh5hT2Ut/HLnbb RB9tePeti2cGhxmNWImCyHwFdtBM/eALQ6VrMuXePPkopqXx8jNYijPEIddlI8j/jo rMu+yHRXb9pWp7bbkWtQuffjNgRjBc8wN/OklEVX/QczpIuIKM/L4ldE5ddA2VhSx5 8tWDdTDa/7A3d2c+COeKwy3/taenyFjfocYfExXIGfn4DbUtjYgrir6XyqkwozhBzV gX3g/Z2Fl/18jR5mmWsR3jcoZzk6GR1rBJByLdwpylNZAv0a3eKAVHxVBZIQJ8qn5A eciFXOFPx5+Jw== From: Sasha Levin To: stable@vger.kernel.org Cc: Michal Pecio , co+fd80bc5967eb22c3@bugs.sh, Mathias Nyman , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.6.y] usb: xhci: Fix bounce buffer overflow Date: Tue, 10 Nov 2026 20:50:39 -0500 Message-ID: <20261111015023.442697-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261107053331-failed-6.6-68c5cb7574c5@kernel.org> References: <20261107053331-failed-6.6-68c5cb7574c5@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Michal Pecio [ Upstream commit 68c5cb7574c567e83ba95258cb146db95e069a87 ] High-speed devices with out of spec 1024 byte bulk endpoints exist and are allowed by USB core, but xhci-hcd always sets packet size to 512. The exact nature of these devices isn't documented, commit fb5ee84ea72c ("USB: Accept bulk endpoints with 1024-byte maxpacket") only states that they "don't work with xHCI host controllers", whatever it means. But somebody (or a malicious device) can try, and then the driver will allocate a 512 byte bounce buffer for this endpoint and may write up to 1024 bytes into it if particular scatter-gather URBs are used, because xhci_align_td() obtains packet size from the descriptor. Fix this. As a side effect, TRBs will be aligned to the packet size chosen by the driver on all endpoints of all speeds. Alignment serves the xHC, not device, so this is fine. Only out of spec devices are affected anyway. Reported-by: co+fd80bc5967eb22c3@bugs.sh Link: https://lore.kernel.org/linux-usb/D4tcSGerkYkIV1DmaUo1t8TaR5qQElDLkidn@bugs.sh/ Fixes: f9c589e142d0 ("xhci: TD-fragment, align the unsplittable case with a bounce buffer") Cc: stable@vger.kernel.org Signed-off-by: Michal Pecio Signed-off-by: Mathias Nyman Link: https://patch.msgid.link/20261009151624.618967-11-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman [ sashal: adapted the max_pkt assignment removal to match usb_endpoint_maxp() instead of xhci_usb_endpoint_maxp() ] Signed-off-by: Sasha Levin --- drivers/usb/host/xhci-ring.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 66c399253a9b4..3794492b16ec2 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -3644,15 +3644,13 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred, static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len, - u32 *trb_buff_len, struct xhci_segment *seg) + u32 *trb_buff_len, struct xhci_segment *seg, u32 max_pkt) { struct device *dev = xhci_to_hcd(xhci)->self.sysdev; unsigned int unalign; - unsigned int max_pkt; u32 new_buff_len; size_t len; - max_pkt = usb_endpoint_maxp(&urb->ep->desc); unalign = (enqd_len + *trb_buff_len) % max_pkt; /* we got lucky, last normal TRB data on segment is packet aligned */ @@ -3797,9 +3795,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (enqd_len + trb_buff_len < full_len) { field |= TRB_CHAIN; if (trb_is_link(ring->enqueue + 1)) { - if (xhci_align_td(xhci, urb, enqd_len, - &trb_buff_len, - ring->enq_seg)) { + if (xhci_align_td(xhci, urb, enqd_len, &trb_buff_len, + ring->enq_seg, ring->bounce_buf_len)) { send_addr = ring->enq_seg->bounce_dma; /* TD bounced at least, and last on this seg */ td->bounce_seg = ring->enq_seg; -- 2.53.0