Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1438e412 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman
Browse files

usb: xhci-mtk: fix issue of out-of-bounds array access



commit de5107f473190538a65aac7edea85209cd5c1a8f upstream.

Bus bandwidth array access is based on esit, increase one
will cause out-of-bounds issue; for example, when esit is
XHCI_MTK_MAX_ESIT, will overstep boundary.

Fixes: 7c986fbc16ae ("usb: xhci-mtk: get the microframe boundary for ESIT")
Cc: <stable@vger.kernel.org>
Reported-by: default avatarStan Lu <stan.lu@mediatek.com>
Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1629189389-18779-5-git-send-email-chunfeng.yun@mediatek.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e473351
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -539,10 +539,12 @@ static u32 get_esit_boundary(struct mu3h_sch_ep_info *sch_ep)
	u32 boundary = sch_ep->esit;

	if (sch_ep->sch_tt) { /* LS/FS with TT */
		/* tune for CS */
		if (sch_ep->ep_type != ISOC_OUT_EP)
			boundary++;
		else if (boundary > 1) /* normally esit >= 8 for FS/LS */
		/*
		 * tune for CS, normally esit >= 8 for FS/LS,
		 * not add one for other types to avoid access array
		 * out of boundary
		 */
		if (sch_ep->ep_type == ISOC_OUT_EP && boundary > 1)
			boundary--;
	}