Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp2087427pxm; Fri, 4 Mar 2022 09:09:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIriaGGfxok/nvfM2aGlTRHOajfM8p4xnNNcTgu2CxzHT2ot8IiVxeekHd9pMBnKZXIx1V X-Received: by 2002:a50:baaa:0:b0:410:a098:2a7f with SMTP id x39-20020a50baaa000000b00410a0982a7fmr41007032ede.53.1646413742080; Fri, 04 Mar 2022 09:09:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646413742; cv=none; d=google.com; s=arc-20160816; b=JyTEMKaUrlep7ctI1BSjR3engRUOlxog8pDQDEIfppIPF6S/G6QY8Wz6xIn3Eh1FZv IjhPod6JW4VmnhlBl4+ZES0uAELRbXpo6/Ely99XKCen3LXXC+BfnGROPrk5hMfLdfQj CAON4YCNVbwGsFB+wFRR3y0TVNaUyz+NN4td27nURpvKgIjf/bg/Lr3Y6/UeV1Yk96BG l8DdPAc9r91okIbNgD1Y3Sp+yDXx1kvxaFMsg2cnHxIEpb2DGAt9qASa68SLh5XV/fai JCCmj/vQMay0EntO6qmpXAurp8BO3LFouFdSrnkh9oWCTEqoyWt9Nrvp0CkQLKvLBphM 9fZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=aUJOmXrWkRUsU+24VetT8bs4gNE42rohiVVM4CXvmWQ=; b=GeHENiJgYuUh8I1hK2C0vpEdhZ04gsV53p39myE1FYXvaH7sXvbvpu1SgRMy7vNvVB ChOwTdqljJ9So+mugQl0+YvPgbcnaq7OCtA+2Ayk7On2+ofxL9noLgNXy7r+0JfTUlj9 kvoML4WEDGwiBMA/65syfe7517SLMIS+5v9zvcs3gwbmoJpF9pGQjPl1B6/mpzLHV2aC Rho/5qAv5tDVWrvGdTjtxXivpY5vg1ljojrtC0vdm7+bulZLplwUQBAsYJ6psSH/9PnG Zk4wjIjMFULl71TDsdvLyS0hovIafBYF2jwvUeHuwO2ku2rUAPCK8itGsujbW+mrxkIi ukKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sb6-20020a1709076d8600b006da84362433si4003139ejc.843.2022.03.04.09.08.16; Fri, 04 Mar 2022 09:09:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-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; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238845AbiCDO4V (ORCPT + 72 others); Fri, 4 Mar 2022 09:56:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbiCDO4U (ORCPT ); Fri, 4 Mar 2022 09:56:20 -0500 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD29B1BD9AC for ; Fri, 4 Mar 2022 06:55:28 -0800 (PST) X-UUID: 10e6182c66b94cc987cadbb2152244c8-20220304 X-UUID: 10e6182c66b94cc987cadbb2152244c8-20220304 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1103576701; Fri, 04 Mar 2022 22:55:23 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 4 Mar 2022 22:55:22 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 4 Mar 2022 22:55:21 +0800 From: Deren Wu To: Felix Fietkau , Lorenzo Bianconi CC: Sean Wang , Soul Huang , YN Chen , Leon Yen , Eric-SY Chang , Deren Wu , KM Lin , Robin Chiu , CH Yeh , Posh Sun , Eric Liang , Stella Chang , Evelyn Tsai , Ryder Lee , Shayne Chen , linux-wireless , linux-mediatek , Deren Wu , Lorenzo Bianconi Subject: [PATCH v2] mt76: fix monitor mode crash with sdio driver Date: Fri, 4 Mar 2022 22:54:05 +0800 Message-ID: <5483fa4cfcde4662e01120637618ba5c6fa66cac.1646404261.git.deren.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-MTK: N X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,MAY_BE_FORGED, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,T_SPF_TEMPERROR,UNPARSEABLE_RELAY 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-wireless@vger.kernel.org From: Deren Wu 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 --- v2 : update to 256, a safer value. --- 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 5e10fe156926..81078be3bd07 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.18.0