From patchwork Mon Oct 24 09:48:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Yu X-Patchwork-Id: 8292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp355841wru; Mon, 24 Oct 2022 03:02:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7A1n6owXXMjzQo51wa8nHCu4ag01AJTRNRyTgyAtaimJ2wO0YyViGZ1oYpOXYZaxuskE7e X-Received: by 2002:a17:902:f60c:b0:17c:163f:c0a8 with SMTP id n12-20020a170902f60c00b0017c163fc0a8mr31713938plg.38.1666605763607; Mon, 24 Oct 2022 03:02:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666605763; cv=none; d=google.com; s=arc-20160816; b=oMhzxWdxyrcfoiUMqN6fgcbyXRINQpY1x1da6+4eDzdl8APAMhwoukneFgWoXqqBGt eSDlbDTZfcwho6teMMbEfzDmNPvxAWWSbhsy/5k4oaEauwq0XL0t3oew5A3h3NqLNvpp c93cTirLYQk/Ug3J1ENjngtHM+a2f5Af+31ALTShNeaGMhSTYDFUQEoUTt/u6kXSgNYB xMsQMPPxgP3H8zDbD+vNLILTCJc9fJBzLIcSc/Ckz5VtVS6SYBWFtvC9yrtLSWLKDzhX wwK1gIBj9vyp7eLvzJxRlPMYROnPvJnCH9ESQGX2X4MS/+6sdDR1BQDONCM5jYNTRokw z9Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:to:from:dkim-signature; bh=XnAGFFH6hlB9GkUsVAF0QK5SQgC3hf7SewwhsiTdnHA=; b=CtY7EQlS/W5Oxy5UUvqhvT+Kt1Vmn5pZ3w3XVFk3+76zbB027vauQRSgnSttLimre1 dbLXSDW9hLC7j6M4npibMIS64mwAkhy5nY9EKenbmsCvxvPdWngdIPLautTT+8RR7KA1 DzSMWelN7GgnzYrgqH47fioggbD8Q6KJ/2P93epuXFRdBeNLqhztjRzRd0ab/6W8FCcj U5yADLmh+3f9g2O0lU3ujqysW6Nkr9mj5ZdTRe+21apz8ZADPYmTzPVrH0JMBvxGI74N 5ppqzQyb/PbBFCiMx9sl1cvm4SjvRPWHMTE1bvNORhAX/ox7m2G3MoyHYAKnqmUuzu8d k/SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=5kjelKIa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s187-20020a632cc4000000b0045e96393e37si33671721pgs.20.2022.10.24.03.02.29; Mon, 24 Oct 2022 03:02:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=5kjelKIa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230309AbiJXJtH (ORCPT + 99 others); Mon, 24 Oct 2022 05:49:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230016AbiJXJtF (ORCPT ); Mon, 24 Oct 2022 05:49:05 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 443D560495 for ; Mon, 24 Oct 2022 02:48:59 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id f140so8557179pfa.1 for ; Mon, 24 Oct 2022 02:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XnAGFFH6hlB9GkUsVAF0QK5SQgC3hf7SewwhsiTdnHA=; b=5kjelKIaoQNlKa+/O/o1rvz6jyKf6B3J8qwQv7aZhfvbh8k0GyIkH5SOcN2anjY7Ax J8s4LN2F2vS0tcd/9WiqQEXXYJINxsEgNo/NSHRFHNx//7ZGecdbOc7YWviJ6LnZVRsF uo+Hf5KMVgLFcFwTyyc4jAED5DvhQsI9ZDdbmGF/tg08oMiXUltHu8V73hvJ4RwSgil3 8eZUqK6P5QEWc2DDKGNb0UAaLu5NmK2x0DyI6kqv9d9RZbclUKwuiruh7nuUov5+/trk pLWSTn4ST0wxX7/r0DeAg8KjnefevIOYTSfptQ9OZwWr3fXDhBoks9jqt8B5W+i9Fnhy GO+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XnAGFFH6hlB9GkUsVAF0QK5SQgC3hf7SewwhsiTdnHA=; b=Uj2YfGcPAcM+M9KxkjuymAjjQLxHHsgBCy3KJ95TpIqiQyHMNEUHSlDeCnNII6jVkp 6Uj26FzWZrhjhHq1A6L0hlc5bpknpbugA2OpEy+pfqasogr5O/kxllAoCi+F1ZTsDBrX 2Enu2qFbgYJCq4QJ4HCmerpcNBxF4xAS3l7s7/EYroktwbB4GJcT97dSGovT3K7qEGa9 dFePzuptJKMyqeM5UBA2sPp3asTiwZ9Kv2hqVwqq8ScOqLz59rJDHdnEQ892Y9wfk6Vj cUStggyAAP8+qlxBHmWj4GxFFbUJw2O1/MPeab5024XK1KNBv1+W8GHPMc0AmVGF9jI7 Cb4w== X-Gm-Message-State: ACrzQf1KoMHcGj8Z5qswTN6LaVs/QgTb/zvPSDsqJylJAwYiRuYQhQDr nWrauJPM+H2VgkKYLnHKPWPrMYCV26aYpQfZ X-Received: by 2002:a63:34c8:0:b0:46e:f67c:c117 with SMTP id b191-20020a6334c8000000b0046ef67cc117mr5823331pga.401.1666604938609; Mon, 24 Oct 2022 02:48:58 -0700 (PDT) Received: from localhost ([103.136.220.142]) by smtp.gmail.com with ESMTPSA id p1-20020a62d001000000b0056bc742d21esm1764058pfg.176.2022.10.24.02.48.57 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Oct 2022 02:48:58 -0700 (PDT) From: Lei YU To: Felipe Balbi , Greg Kroah-Hartman , Joel Stanley , Andrew Jeffery , Lei YU , Henry Tian , Jakob Koschel , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] usb: gadget: aspeed: fix buffer overflow Date: Mon, 24 Oct 2022 09:48:53 +0000 Message-Id: <20221024094853.2877441-1-yulei.sh@bytedance.com> X-Mailer: git-send-email 2.11.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747562805399918405?= X-GMAIL-MSGID: =?utf-8?q?1747562805399918405?= From: Henry Tian In ast_vhub_epn_handle_ack() when the received data length exceeds the buffer, it does not check the case and just copies to req.buf and cause a buffer overflow, kernel oops on this case. This issue could be reproduced on a BMC with an OS that enables the lan over USB: 1. In OS, enable the usb eth dev, verify it pings the BMC OK; 2. In OS, set the usb dev mtu to 2000. (Default is 1500); 3. In OS, ping the BMC with `-s 2000` argument. The BMC kernel will get oops with below logs: skbuff: skb_over_panic: text:8058e098 len:2048 put:2048 head:84c678a0 data:84c678c2 tail:0x84c680c2 end:0x84c67f00 dev:usb0 ------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:113! Internal error: Oops - BUG: 0 [#1] ARM CPU: 0 PID: 0 Comm: swapper Not tainted 5.15.69-c9fb275-dirty-d1e579a #1 Hardware name: Generic DT based system PC is at skb_panic+0x60/0x6c LR is at irq_work_queue+0x6c/0x94 Fix the issue by checking the length and set `-EOVERFLOW`. Tested: Verify the BMC kernel does not get oops in the above case, and the usb ethernet gets RX packets errors instead. Signed-off-by: Lei YU Signed-off-by: Henry Tian Acked-by: Benjamin Herrenschmidt Reviewed-by: Neal Liu --- drivers/usb/gadget/udc/aspeed-vhub/core.c | 2 +- drivers/usb/gadget/udc/aspeed-vhub/epn.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/usb/gadget/udc/aspeed-vhub/core.c b/drivers/usb/gadget/udc/aspeed-vhub/core.c index 7a635c499777..ac3ca24f8b04 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/core.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/core.c @@ -37,7 +37,7 @@ void ast_vhub_done(struct ast_vhub_ep *ep, struct ast_vhub_req *req, list_del_init(&req->queue); - if (req->req.status == -EINPROGRESS) + if ((req->req.status == -EINPROGRESS) || (status == -EOVERFLOW)) req->req.status = status; if (req->req.dma) { diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c index b5252880b389..56e55472daa1 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c @@ -84,6 +84,7 @@ static void ast_vhub_epn_handle_ack(struct ast_vhub_ep *ep) { struct ast_vhub_req *req; unsigned int len; + int status = 0; u32 stat; /* Read EP status */ @@ -119,9 +120,15 @@ static void ast_vhub_epn_handle_ack(struct ast_vhub_ep *ep) len = VHUB_EP_DMA_TX_SIZE(stat); /* If not using DMA, copy data out if needed */ - if (!req->req.dma && !ep->epn.is_in && len) - memcpy(req->req.buf + req->req.actual, ep->buf, len); - + if (!req->req.dma && !ep->epn.is_in && len) { + if (req->req.actual + len > req->req.length) { + req->last_desc = 1; + status = -EOVERFLOW; + goto done; + } else { + memcpy(req->req.buf + req->req.actual, ep->buf, len); + } + } /* Adjust size */ req->req.actual += len; @@ -129,9 +136,10 @@ static void ast_vhub_epn_handle_ack(struct ast_vhub_ep *ep) if (len < ep->ep.maxpacket) req->last_desc = 1; +done: /* That's it ? complete the request and pick a new one */ if (req->last_desc >= 0) { - ast_vhub_done(ep, req, 0); + ast_vhub_done(ep, req, status); req = list_first_entry_or_null(&ep->queue, struct ast_vhub_req, queue);