From patchwork Wed Dec 28 22:40:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fedor Pchelkin X-Patchwork-Id: 37279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2120169wrt; Wed, 28 Dec 2022 14:51:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXsdEO17Cp2x3ZhJfo2i1i95RMewCZ1GL4KK3boKhuiFB8rMBLhCwQoCHkx2dIyKPxvHwVwk X-Received: by 2002:a17:906:700f:b0:7c0:d1cb:2165 with SMTP id n15-20020a170906700f00b007c0d1cb2165mr22355752ejj.56.1672267865886; Wed, 28 Dec 2022 14:51:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672267865; cv=none; d=google.com; s=arc-20160816; b=BBGT8mIpMto3xUcMUYjF47RxKgHbYIoVr6DdjYOHR+8tBtUSF32DWVVDcUoI++QckH Gpr1JjT57ZAi9oJlyz0VGdQvmaIMJz3x+eS/nS1DMCFWrJSDx7ucrBWZRDT4PvX7SKQu suc1VjeFm15qDoVsXAzegMoLfedK8u8oMP1/0lehmSPRGUyLZ8hpoiMCrn63rLufMAcP u2Qc9rKI+WQMpTkqXTcrTGa+jBTcWBzMk6ko6RcWxzAq1AbSiUFJDw5k6n5kKJRWLjjl SrbVLZ823Ud/kggdZVxgSwT988bimOX/PAFCyLvkJ2Ait8wxlvfykYOCvifL4gocmdbp 1KPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=neoRbvxxP4comx0tozF7xdFmBO8iyRduD2eOKs2xLrk=; b=l0CSyAtMG8SJzTx9c1vLu5kHE7k0iLUuGTyxrwtUaYmFpOd75117PB+L7N7VU1vPL5 aN8FFxb19kpumYBIcwq8bRUauhSSLGUrpG5Rmylp2gEptr/ykqi1DjdfFMOZk0eZcRMJ 9plWewfdCZoUqoVE3w9ushEkgykWPpR+EQXnvA96yBPM4ElHx9Ro6l+FFucQDAf4/+PM LLJy7kHoF5PR9lrzvQ12viJKFIV/O6VbDEptDSvPWLDrBFxnvdq5C470m0S2r65MJQM3 Mj5UF7NhXtxAO1ncnPaau17foOLlk7hzxbuacWN6zEg7FiO3/one0E8+xe21bJgpOOUx x/Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b="d/CEL6tN"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh37-20020a1709076ea500b007d97d797c8dsi16334628ejc.215.2022.12.28.14.50.40; Wed, 28 Dec 2022 14:51:05 -0800 (PST) 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=@ispras.ru header.s=default header.b="d/CEL6tN"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231211AbiL1Wkb (ORCPT + 99 others); Wed, 28 Dec 2022 17:40:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229630AbiL1Wk3 (ORCPT ); Wed, 28 Dec 2022 17:40:29 -0500 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6275213EA8; Wed, 28 Dec 2022 14:40:27 -0800 (PST) Received: from fedcomp.intra.ispras.ru (unknown [46.242.14.200]) by mail.ispras.ru (Postfix) with ESMTPSA id 92BEF40737C3; Wed, 28 Dec 2022 22:40:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 92BEF40737C3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1672267223; bh=neoRbvxxP4comx0tozF7xdFmBO8iyRduD2eOKs2xLrk=; h=From:To:Cc:Subject:Date:From; b=d/CEL6tNNDZgMnIIXXZWjqdwqDmtKP1tC+KZyME68TRR1AeqYjYbO6STHDBcg2Z9z akjGR9HLFWn1hIfVpeqWLGNtQ6L7T9g1Ba9Z9bPQ3TECkzYAk9bVKeHm4BFx9IsJWb bKMxf1vGKVHruW3iJ72LCzOOMId0wsncdqQGIRIk= From: Fedor Pchelkin To: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Kalle Valo Cc: Fedor Pchelkin , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Zekun Shen , Joe Perches , "John W. Linville" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org Subject: [PATCH] wifi: ath9k: hif_usb: clean up skbs if ath9k_hif_usb_rx_stream() fails Date: Thu, 29 Dec 2022 01:40:08 +0300 Message-Id: <20221228224008.146343-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1753499949948161204?= X-GMAIL-MSGID: =?utf-8?q?1753499949948161204?= Syzkaller detected a memory leak of skbs in ath9k_hif_usb_rx_stream(). While processing skbs in ath9k_hif_usb_rx_stream(), the already allocated skbs in skb_pool are not freed if ath9k_hif_usb_rx_stream() fails. If we have an incorrect pkt_len or pkt_tag, the skb is dropped and all the associated skb_pool buffers should be cleaned, too. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: 6ce708f54cc8 ("ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream") Fixes: 44b23b488d44 ("ath9k: hif_usb: Reduce indent 1 column") Signed-off-by: Fedor Pchelkin Signed-off-by: Alexey Khoroshilov --- drivers/net/wireless/ath/ath9k/hif_usb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index 1a2e0c7eeb02..d02cec114280 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -586,14 +586,14 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, if (pkt_tag != ATH_USB_RX_STREAM_MODE_TAG) { RX_STAT_INC(hif_dev, skb_dropped); - return; + goto invalid_pkt; } if (pkt_len > 2 * MAX_RX_BUF_SIZE) { dev_err(&hif_dev->udev->dev, "ath9k_htc: invalid pkt_len (%x)\n", pkt_len); RX_STAT_INC(hif_dev, skb_dropped); - return; + goto invalid_pkt; } pad_len = 4 - (pkt_len & 0x3); @@ -654,6 +654,11 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, skb_pool[i]->len, USB_WLAN_RX_PIPE); RX_STAT_INC(hif_dev, skb_completed); } + return; +invalid_pkt: + for (i = 0; i < pool_index; i++) + kfree_skb(skb_pool[i]); + return; } static void ath9k_hif_usb_rx_cb(struct urb *urb)