Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp38742lfv; Tue, 12 Apr 2022 16:21:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwI6qSiavG2MCofP6a6M/69Ve1FMbYhOdRGNSKy91OuKIoK9drBU3AGhyQ+Ctb4UBGzMpwV X-Received: by 2002:a17:902:6506:b0:158:251b:cb61 with SMTP id b6-20020a170902650600b00158251bcb61mr22486890plk.157.1649805660919; Tue, 12 Apr 2022 16:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649805660; cv=none; d=google.com; s=arc-20160816; b=Z2wMxxKJyZF7okElgyK7SA95b9/MNnjn+FqVUt385O1B8ZtCO2eZ8195wu8rANKL4e jdN3tsVVmwWQ3V5ut93M1HenRO8UBk9/Ugfhm0tnyz6g8b8OywECFJeQYjdMmdXVf1g1 WxvsGkJ+t9EOfW6iA2/OHAomQSaJta65jXvILmEIzQF+P/qO21/i/uu9F5LzQiOeb/DO u/6Gyb5k9NvDf4znsJqeO3LZoEdybKRQkkO/3nR5x+QJeSGIDg6gfeG6CI8MuIV7/3dc qawufQtLCyfxe1+Yf9YKJJCja9rVa9HlRP35P5zbvOPr4ovR365XYOuM2m2qk+nFBUYS WRGw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GEokzg7Z9wvoiqb2NDtZ2Hf2ZvWctCSb333wvCKuJ0k=; b=udlpuWSOxCPDIUOQPjTC6WgiI4IW3CoQNNaRZxjIOIlcVWO+O1oBdFulBs2vVtH0S/ +TtXw1q9cxzzF/XY6o/NLJkb8hg2kagAKQ6pOLZ3FD7se5t96rRuAnCc1x2xXKTLiZdE qAs2tQRknLW9w1m2lNtl350YfW7/3Yc5vNiKHeCWNgUScTSqerKnSCxtyRDGBVopJt2+ xghqxtYigIdRkCEce15Rwp/MsYbLCy/JPIK/8lASsDiLI7QazaVwYzLNCTbdGxRUjlQw 4R90XA6kZTgHzNyK0TIAM1u3j2EnzsN/cRx2dEVKAn1aqLe4BT5huy+POqBPaVK8Vt56 14bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hDSBi0cL; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id i8-20020a170902c94800b00156a95ac6efsi2590444pla.611.2022.04.12.16.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:21:00 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hDSBi0cL; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7C49819A544; Tue, 12 Apr 2022 14:13:16 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384285AbiDLIkC (ORCPT + 99 others); Tue, 12 Apr 2022 04:40:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357210AbiDLHjw (ORCPT ); Tue, 12 Apr 2022 03:39:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBECC140F0; Tue, 12 Apr 2022 00:13:40 -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 29CF161701; Tue, 12 Apr 2022 07:13:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D680C385A1; Tue, 12 Apr 2022 07:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747619; bh=keaXA1ahsEIO9lUMtg0aK6GPS2FnsxjF9uZtFjHzBoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hDSBi0cLG0R/OFbB25Cgkcbkw9KB04SnizM9ZsOJr5uhBlWmSUykJ8sUyDrdwiN18 L9jVmaoBNeVeP+3PeQSvZsugeNp4BezTvo9Vi9rKswpplQO2pYHBzqfdLtPsQbjLLK 5Tph1PWkNIPxmri9i0SJL35KnVrexrCYPipXE1rM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lorenzo Bianconi , Sean Wang , Deren Wu , Felix Fietkau , Sasha Levin Subject: [PATCH 5.17 144/343] mt76: fix monitor mode crash with sdio driver Date: Tue, 12 Apr 2022 08:29:22 +0200 Message-Id: <20220412062955.539382313@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062951.095765152@linuxfoundation.org> References: <20220412062951.095765152@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Deren Wu [ Upstream commit 123bc712b1de0805f9d683687e17b1ec2aba0b68 ] mt7921s driver may receive frames with fragment buffers. If there is a CTS packet received in monitor mode, the payload is 10 bytes only and need 6 bytes header padding after RXD buffer. However, only RXD in the first linear buffer, if we pull buffer size RXD-size+6 bytes with skb_pull(), that would trigger "BUG_ON(skb->len < skb->data_len)" in __skb_pull(). To avoid the nonlinear buffer issue, enlarge the RXD size from 128 to 256 to make sure all MCU operation in linear buffer. [ 52.007562] kernel BUG at include/linux/skbuff.h:2313! [ 52.007578] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP [ 52.007987] pc : skb_pull+0x48/0x4c [ 52.008015] lr : mt7921_queue_rx_skb+0x494/0x890 [mt7921_common] [ 52.008361] Call trace: [ 52.008377] skb_pull+0x48/0x4c [ 52.008400] mt76s_net_worker+0x134/0x1b0 [mt76_sdio 35339a92c6eb7d4bbcc806a1d22f56365565135c] [ 52.008431] __mt76_worker_fn+0xe8/0x170 [mt76 ef716597d11a77150bc07e3fdd68eeb0f9b56917] [ 52.008449] kthread+0x148/0x3ac [ 52.008466] ret_from_fork+0x10/0x30 Signed-off-by: Lorenzo Bianconi Signed-off-by: Sean Wang Signed-off-by: Deren Wu Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index 1f6f7a44d3f0..5197fcb06649 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -19,7 +19,7 @@ #define MT_MCU_RING_SIZE 32 #define MT_RX_BUF_SIZE 2048 -#define MT_SKB_HEAD_LEN 128 +#define MT_SKB_HEAD_LEN 256 #define MT_MAX_NON_AQL_PKT 16 #define MT_TXQ_FREE_THR 32 -- 2.35.1