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 9B2EBC433EF for ; Tue, 19 Apr 2022 18:22:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356775AbiDSSYm (ORCPT ); Tue, 19 Apr 2022 14:24:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357475AbiDSSXX (ORCPT ); Tue, 19 Apr 2022 14:23:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5B223EF32; Tue, 19 Apr 2022 11:16:24 -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 1A709B818CE; Tue, 19 Apr 2022 18:16:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 243A5C385A5; Tue, 19 Apr 2022 18:16:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650392174; bh=pNEhoJzPmz++NdAP0mVw4iCzcOKcOf8Vb7TZvul1ZJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TREN0dy8N5qmWabrzVMsI5aFVQYYMa132spx4Y2C39AlJcCBU7XTvy48rlyADYJ4j V6aB2+ZM8BvNcN4fSESLKneiPRxDSQCDkxU3MzU0M7j9UhUhOhnyKZicKTLZWc5lGK Uig97jceTudJetJOjGGFhL4UFWdHDfC7QY/qD3xHG1fLARHPcCX0y0hJbv05rRp7tQ lfhuN51TJjvKv7IPxPoPINzc9qkHDWMNhmk1Iqt2Bhc7PNN52wSrZzKC//wYOc6okZ BnfyBKVyK3kxV/lxOKy/jX7c+rtzvx0R5Xi7Z45RO5GuS0Ip8h6UK7WZpfUnd5UNyP Y8eO+iTQTTLDA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Borislav Petkov , Borislav Petkov , Arend van Spriel , Franky Lin , Hante Meuleman , Kalle Valo , "David S. Miller" , Jakub Kicinski , brcm80211-dev-list.pdl@broadcom.com, netdev@vger.kernel.org, Arend van Spriel , Sasha Levin , pabeni@redhat.com, linus.walleij@linaro.org, hdegoede@redhat.com, mbrugger@suse.com, marcan@marcan.st, wsa+renesas@sang-engineering.com, mike.rudenko@gmail.com, angus@akkea.ca, linux-wireless@vger.kernel.org, SHA-cyfmac-dev-list@infineon.com Subject: [PATCH AUTOSEL 4.14 6/9] brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant Date: Tue, 19 Apr 2022 14:15:54 -0400 Message-Id: <20220419181557.486336-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419181557.486336-1-sashal@kernel.org> References: <20220419181557.486336-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Borislav Petkov [ Upstream commit 6fb3a5868b2117611f41e421e10e6a8c2a13039a ] Fix: drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c: In function ‘brcmf_sdio_drivestrengthinit’: drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:3798:2: error: case label does not reduce to an integer constant case SDIOD_DRVSTR_KEY(BRCM_CC_43143_CHIP_ID, 17): ^~~~ drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:3809:2: error: case label does not reduce to an integer constant case SDIOD_DRVSTR_KEY(BRCM_CC_43362_CHIP_ID, 13): ^~~~ See https://lore.kernel.org/r/YkwQ6%2BtIH8GQpuct@zn.tnic for the gory details as to why it triggers with older gccs only. Signed-off-by: Borislav Petkov Cc: Arend van Spriel Cc: Franky Lin Cc: Hante Meuleman Cc: Kalle Valo Cc: "David S. Miller" Cc: Jakub Kicinski Cc: brcm80211-dev-list.pdl@broadcom.com Cc: netdev@vger.kernel.org Acked-by: Arend van Spriel Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/Ykx0iRlvtBnKqtbG@zn.tnic Signed-off-by: Sasha Levin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index d198a8780b96..8fa4ffff7c32 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -552,7 +552,7 @@ enum brcmf_sdio_frmtype { BRCMF_SDIO_FT_SUB, }; -#define SDIOD_DRVSTR_KEY(chip, pmu) (((chip) << 16) | (pmu)) +#define SDIOD_DRVSTR_KEY(chip, pmu) (((unsigned int)(chip) << 16) | (pmu)) /* SDIO Pad drive strength to select value mappings */ struct sdiod_drive_str { -- 2.35.1