Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Wright Feng <wright.feng@cypress.com>
To:     linux-wireless@vger.kernel.org
Cc:     wright.feng@cypress.com, brcm80211-dev-list@broadcom.com,
        brcm80211-dev-list@cypress.com,
        Arend van Spriel <arend.vanspriel@broadcom.com>,
        Franky Lin <franky.lin@broadcom.com>,
        Hante Meuleman <hante.meuleman@broadcom.com>,
        Kalle Valo <kvalo@codeaurora.org>, chi-hsien.lin@cypress.com,
        Raveendran Somu <raveendran.somu@cypress.com>
Subject: [PATCH v2 1/5] brcmfmac: To fix kernel crash on out of boundary access
Date:   Thu,  4 Jun 2020 02:18:31 -0500
Message-Id: <20200604071835.3842-2-wright.feng@cypress.com>
In-Reply-To: <20200604071835.3842-1-wright.feng@cypress.com>
References: <20200604071835.3842-1-wright.feng@cypress.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from iot-wlan-dev-u02.aus.cypress.com (12.110.209.245) by MN2PR01CA0049.prod.exchangelabs.com (2603:10b6:208:23f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3066.18 via Frontend Transport; Thu, 4 Jun 2020 07:18:49 +0000
X-Mailer: git-send-email 2.25.0
X-Originating-IP: [12.110.209.245]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: b578fada-3a8c-43b6-a473-08d808578742
X-MS-TrafficTypeDiagnostic: DM6PR06MB5146:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM6PR06MB51464449897925113F599F7EFB890@DM6PR06MB5146.namprd06.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:785;
X-Forefront-PRVS: 04244E0DC5
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: eqLgGVyLvH7rRpPmglaHVXg2cQnF7RmMdH7+A8TXvr8rlXguSXR6ir/FyKnwQOmGe93iBGIKqzLgl87lb+3YwHXOZ+Snsnn529EoNRtbhlFjaRsvsnMj35OZZRK8jBNubUwCYSkzdsGG7vRykORukYkjBRZe0SIASKSyPlDUX4ZOPjCdseEJqj7T6fdy3C202T9uG2km/p5w1+NkxIIveS6bpI46JfFrVvenAMRlSraU3dLfrGB3Bsc+OzFKWXSwrUyKbb/0x0NgoLsloq7VrHCHK9JXX4rRYQPG4/aIzzxwjBFcjuMZ6LGFoTeNeeDXvqxcdlpselk9guu+O801AQ==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR06MB4748.namprd06.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(376002)(39860400002)(346002)(396003)(366004)(136003)(316002)(54906003)(6666004)(26005)(16526019)(186003)(2616005)(52116002)(36756003)(956004)(7696005)(44832011)(1076003)(8936002)(8676002)(83380400001)(107886003)(6916009)(5660300002)(2906002)(4326008)(86362001)(6486002)(478600001)(66476007)(66946007)(66556008);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: DPzvmifythxjCwVnm/4Jy4QJENyrZJ5edMiPBJnKW3yMvXo/GSl7b7tVnPxZv277EWMUArKuA2ZvgRNhl+sSInEOrmcdKeczW2CW+0uHEuTEfFBBBnc6yuf1A9feqvO1zL0gF3x81FyP0YRMUWtFwyVZyHotlh+CWK9+coBHjs626Tm5Mc2BpxPp0E1cYI4/VFkF9/npXXUeg4Esb/SgpMUequDObJQMmvpCI34ew4wbeAk4fsfmQb8KHXZp43J5283PkFNjk8SQ8YcODalMDo8wQmkuM8fdAepr7KkZDRnC7+0G3/3qTFBvapMMXTYIycLC5MJ1k2zSzEBnovmieZcMaRgFi+U8B/VtZHJFSwO+H0S7yEM7mIkc9VHNqxHqx5fEYs7G3A3nlar8OsjkVa2dsJvS2XX94B+4psLpsI0YKNj7JFNMzJqDjgoBRrHCiv3jk2w3M0DK0gTiYst6obQ6wyAbgdBmzc9ye1IjqdW+SNfil2btIvz7sb3Vuv57
X-OriginatorOrg: cypress.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b578fada-3a8c-43b6-a473-08d808578742
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2020 07:18:50.1546
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 011addfc-2c09-450d-8938-e0bbc2dd2376
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: IG9UH+NtSl6LVsRQ+2j/0chh1FrLhJmEsFlhcShNdpj/oLtIE+y1nIjUkIaAHa+x+7cJ5m4LsqL7FeBl9PPuYg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR06MB5146
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Raveendran Somu <raveendran.somu@cypress.com>

To truncate the additional bytes, if extra bytes have been received.
Current code only have a warning and proceed without handling it.
But in one of the crash reported by DVT, these causes the
crash intermittently. So the processing is limit to the skb->len.

Signed-off-by: Raveendran Somu <raveendran.somu@cypress.com>
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
Signed-off-by: Wright Feng <wright.feng@cypress.com>
---
v2:
 - Correct all typos in commit message

 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
index 09701262330d..531fe9be4025 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
@@ -1843,6 +1843,9 @@ void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb)
 
 	WARN_ON(siglen > skb->len);
 
+	if (siglen > skb->len)
+		siglen = skb->len;
+
 	if (!siglen)
 		return;
 	/* if flow control disabled, skip to packet data and leave */
-- 
2.25.0