Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp23807pxb; Tue, 12 Apr 2022 15:43:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwa6i2jb/eMvLcyFOfQBLx2NiYjfiEMermCN2VdwEhJJDXoO+j9h4DQeJHogq3nZX7oCVNl X-Received: by 2002:a17:90a:e7c8:b0:1cb:a81b:19a1 with SMTP id kb8-20020a17090ae7c800b001cba81b19a1mr7413693pjb.25.1649803429825; Tue, 12 Apr 2022 15:43:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649803429; cv=none; d=google.com; s=arc-20160816; b=aFH0n6jo4+McL/pAgsgkVF0rzusCPVq/V5xy6JwZHTlbwW4RSwhMw+kmnwY9vBcByz WIiRD+T7MKPKLPrhqDkO1KfuQe8uBjBVOcdRQO2TuFwUrVOpj2CxLty90dDCVYYwS39c 6VG7XP99KCaqIHG/Cs3KK3SXlv+HaIwgzfBCffU4Fh9LRdxBrcpALaMTCVvhnIsdhHIX hd22PPUs+FJC6H48Of40isA8wrvhLLGbKgEGr8/Q+4XuKx7EuAEmz+3ol4ZYqSsN4wHs xzSsFZM5Nk1TVT9ySdMrZf37DHpt3fwGrbV/vG8mCD4SlUOK24M1w5qHsMgH8nMjT+GI MgkQ== 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=UxF0v4aMNcToqLbolq/qyJR/27tZQ2AQLA0SwbI+EWY=; b=xFGaXcrEdeB+5U9m0F5z6gqjY6oxgPhDhGINdkK2H3HP6dmoU8yJP+c++reI1fRVG7 5DDBNfXWw2y671vXiEwXaLlr8oyRGfIxueyzA0NV8IxBULydpAiYtiMbUrJY/U642hvP 66TFFVresiryt3lK644XWa2/D8FLFKRhVzlXvq1cR9MZowkzDSQOtFzVq+ZgKyFqCeBO wPC/GKCoaLMYgZUzNmkxip+L/BH1PkQtVfnohrKBpdl4I1BHp1CidhX6Ujegg7t7u5/t 7uatVWAcIe5LiwlWBVigWw3S94wKghMmHyTTYRV457pBhkpGmuAQgWJUzjBfdNXSULHW aWCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YBbk2967; 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 ip11-20020a17090b314b00b001c68744da0dsi13041176pjb.39.2022.04.12.15.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:43:49 -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=YBbk2967; 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 370111017D8; Tue, 12 Apr 2022 14:25:29 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376532AbiDLHoJ (ORCPT + 99 others); Tue, 12 Apr 2022 03:44:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354245AbiDLHRS (ORCPT ); Tue, 12 Apr 2022 03:17:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AA054B871; Mon, 11 Apr 2022 23:58:36 -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 ams.source.kernel.org (Postfix) with ESMTPS id 6DE18B81B4E; Tue, 12 Apr 2022 06:58:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B67C7C385A1; Tue, 12 Apr 2022 06:58:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746714; bh=q1OjChVOmJ4PFhnv9P1M0DRZBGbms2XZZgVzpV0gAW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YBbk2967DXPw5RdH3e0DPwonq4RPQk4aXdihTHCKGa5TIA2atbasxgntsfHRXGy7W YIOh3vzyiF+dTF2pBmMNEuQW6OLMnuTiB+3OZy5KZinIUhiCmuG5Nzex/k4e/p02hp mafOP+X5+VGQ/Zu2eQwn+iH2ghYPSclDxsbiwTnY= 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.16 103/285] mt76: fix monitor mode crash with sdio driver Date: Tue, 12 Apr 2022 08:29:20 +0200 Message-Id: <20220412062946.638370406@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@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 e2da720a91b6..f740a8ba164d 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