From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C32DCC352A1 for ; Thu, 13 Oct 2022 00:30:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231422AbiJMAaL (ORCPT ); Wed, 12 Oct 2022 20:30:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231151AbiJMA10 (ORCPT ); Wed, 12 Oct 2022 20:27:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A73ECDCAC4; Wed, 12 Oct 2022 17:25:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 222FB616BE; Thu, 13 Oct 2022 00:24:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C323BC43470; Thu, 13 Oct 2022 00:24:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665620668; bh=7sB32oWCb0KoLBpJX2Qr1UEhrUV8KsBVv2ewNAThFVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GET+Yaghhfg5QhxHPiOazJkkQ7SooZHWtp35UtWuUMammnMMFN8xewDplr1U3mYUR Fi+5yQ1RwpHW+B/RJIP3dS+Lk5pO6SlxKqQX/SRJEiFOG2VeWlqG0ss/OKQf83nvZD aCTe4uDoxshJAiamZ3ji9yhawYipXpsZICsS42w6EaSyYlTqw+QV/XnZ5jLUwImAh9 qc4dIqhLIvPOaSnotDI+cdyQRtNuuS4Lkm4+LMo5nxtQ4SNkkSdtzerOz5k/sjhEfH oLMix5DgPRohtejsGr5YjR484MNHZiEhGFuDwq8ww3twZYoJCSzhCQSyJEV8xbrw6n xn9w9ndw78SvA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Robin Guo , Greg Kroah-Hartman , Sasha Levin , b-liu@ti.com, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 23/33] usb: musb: Fix musb_gadget.c rxstate overflow bug Date: Wed, 12 Oct 2022 20:23:22 -0400 Message-Id: <20221013002334.1894749-23-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221013002334.1894749-1-sashal@kernel.org> References: <20221013002334.1894749-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robin Guo [ Upstream commit eea4c860c3b366369eff0489d94ee4f0571d467d ] The usb function device call musb_gadget_queue() adds the passed request to musb_ep::req_list,If the (request->length > musb_ep->packet_sz) and (is_buffer_mapped(req) return false),the rxstate() will copy all data in fifo to request->buf which may cause request->buf out of bounds. Fix it by add the length check : fifocnt = min_t(unsigned, request->length - request->actual, fifocnt); Signed-off-by: Robin Guo Link: https://lore.kernel.org/r/20220906102119.1b071d07a8391ff115e6d1ef@inspur.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/musb/musb_gadget.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index fb806b33178a..c273eee35aaa 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -760,6 +760,9 @@ static void rxstate(struct musb *musb, struct musb_request *req) musb_writew(epio, MUSB_RXCSR, csr); buffer_aint_mapped: + fifo_count = min_t(unsigned int, + request->length - request->actual, + (unsigned int)fifo_count); musb_read_fifo(musb_ep->hw_ep, fifo_count, (u8 *) (request->buf + request->actual)); request->actual += fifo_count; -- 2.35.1