From patchwork Wed Jul 27 07:21:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Guo X-Patchwork-Id: 594490 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 13A83C04A68 for ; Wed, 27 Jul 2022 07:24:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229568AbiG0HX6 (ORCPT ); Wed, 27 Jul 2022 03:23:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230211AbiG0HXz (ORCPT ); Wed, 27 Jul 2022 03:23:55 -0400 X-Greylist: delayed 123 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 27 Jul 2022 00:23:48 PDT Received: from unicom145.biz-email.net (unicom145.biz-email.net [210.51.26.145]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 216F940BC4; Wed, 27 Jul 2022 00:23:47 -0700 (PDT) Received: from ([60.208.111.195]) by unicom145.biz-email.net ((D)) with ASMTP (SSL) id VEW00040; Wed, 27 Jul 2022 15:21:40 +0800 Received: from Jtjnmail201613.home.langchao.com (10.100.2.13) by Jtjnmail201613.home.langchao.com (10.100.2.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Wed, 27 Jul 2022 15:21:39 +0800 Received: from Jtjnmail201613.home.langchao.com ([fe80::b8bf:393:bebe:1197]) by Jtjnmail201613.home.langchao.com ([fe80::b8bf:393:bebe:1197%12]) with mapi id 15.01.2507.009; Wed, 27 Jul 2022 15:21:39 +0800 From: =?eucgb2312_cn?b?QW5keSBHdW8gKLn5zsCx8yk=?= To: "b-liu@ti.com" , "gregkh@linuxfoundation.org" CC: "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH] usb: musb: Fix musb_gadget.c rxstate may cause request->buf overflow problems Thread-Topic: [PATCH] usb: musb: Fix musb_gadget.c rxstate may cause request->buf overflow problems Thread-Index: AdihiVlJUOiuGCF1RMKG91qAO7Amow== Date: Wed, 27 Jul 2022 07:21:39 +0000 Message-ID: <7acfffb210974cff959d056ef88221de@inspur.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.180.162.69] MIME-Version: 1.0 tUid: 202272715214042c5e7daceb5030428b39d602d9ad597 X-Abuse-Reports-To: service@corp-email.com Abuse-Reports-To: service@corp-email.com X-Complaints-To: service@corp-email.com X-Report-Abuse-To: service@corp-email.com Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org when the rxstate function executes the 'goto buffer_aint_mapped' code branch, it will always copy the fifocnt bytes data to request->buf, which may cause request->buf out of bounds. for Ethernet-over-USB will cause skb_over_panic when a packet larger than mtu is recived. Fix it by add the length check : fifocnt = min_t(unsigned, request->length - request->actual, fifocnt); Signed-off-by: guoweibin --- drivers/usb/musb/musb_gadget.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 51274b87f46c..4ad5a1f31d7e 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -760,6 +760,7 @@ static void rxstate(struct musb *musb, struct musb_request *req) musb_writew(epio, MUSB_RXCSR, csr); buffer_aint_mapped: + fifo_count = min_t(unsigned, request->length - request->actual, fifo_count); musb_read_fifo(musb_ep->hw_ep, fifo_count, (u8 *) (request->buf + request->actual)); request->actual += fifo_count;