From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFCB8C46467 for ; Sun, 18 Dec 2022 16:54:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232934AbiLRQyw (ORCPT ); Sun, 18 Dec 2022 11:54:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231740AbiLRQxy (ORCPT ); Sun, 18 Dec 2022 11:53:54 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AAB911839; Sun, 18 Dec 2022 08:19:04 -0800 (PST) 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 CAF5260DC9; Sun, 18 Dec 2022 16:18:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E605C433F0; Sun, 18 Dec 2022 16:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671380327; bh=C2r1yf5k0Jyo9wduj/o8oUBtqDfWJcgONjmk2tx6RIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eS0ZFANWKGAw7CjzLFE7GwJFnFdcIK74qwux2xH65l16QxUsFO1TlKozXkIm0vzP2 nVeck0ZOFnbZWpAjrhx+3/Lq1NfZRxe39uSW1JqwR0Y/9Z4qNim8CKHPF0vrl7Uu0z +c5ibnoGUBUoyPuxB01jkm5diC3/WYB0IgsM6fbB/e7oFt1lWsXBzcILnL35gd8MJX KKAVs3I8cxwuhdsnekvEXC5WNITUfYLWnvTXnb8KBOLwUAt1tLoA4walJiQnWnot8D YgqctZIn+UlcOCovIuiAUe+NRgeXR5uMGVHDrfpeh+TgeNqq7t81H9Qvq6NqGcqmcw Vlc8EZbcNCZew== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wright Feng , Chi-hsien Lin , Ian Lin , Kalle Valo , Sasha Levin , aspriel@gmail.com, franky.lin@broadcom.com, hante.meuleman@broadcom.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, marcan@marcan.st, linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, soontak.lee@cypress.com, alep@cypress.com, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 02/30] brcmfmac: return error when getting invalid max_flowrings from dongle Date: Sun, 18 Dec 2022 11:18:07 -0500 Message-Id: <20221218161836.933697-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221218161836.933697-1-sashal@kernel.org> References: <20221218161836.933697-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Wright Feng [ Upstream commit 2aca4f3734bd717e04943ddf340d49ab62299a00 ] When firmware hit trap at initialization, host will read abnormal max_flowrings number from dongle, and it will cause kernel panic when doing iowrite to initialize dongle ring. To detect this error at early stage, we directly return error when getting invalid max_flowrings(>256). Signed-off-by: Wright Feng Signed-off-by: Chi-hsien Lin Signed-off-by: Ian Lin Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20220929031001.9962-3-ian.lin@infineon.com Signed-off-by: Sasha Levin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index b5d2e5b9f67c..8d4512c7181e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -1109,6 +1109,10 @@ static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo) BRCMF_NROF_H2D_COMMON_MSGRINGS; max_completionrings = BRCMF_NROF_D2H_COMMON_MSGRINGS; } + if (max_flowrings > 256) { + brcmf_err(bus, "invalid max_flowrings(%d)\n", max_flowrings); + return -EIO; + } if (devinfo->dma_idx_sz != 0) { bufsz = (max_submissionrings + max_completionrings) * -- 2.35.1