From nobody Fri Sep 20 05:39:38 2024 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 05C78C4332F for ; Tue, 12 Dec 2023 17:14:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233065AbjLLRO3 (ORCPT ); Tue, 12 Dec 2023 12:14:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229963AbjLLRO1 (ORCPT ); Tue, 12 Dec 2023 12:14:27 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D62C9F for ; Tue, 12 Dec 2023 09:14:34 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE9B9C433C9; Tue, 12 Dec 2023 17:14:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702401274; bh=0is0y5MIjJZL1a2nJQ3+WOieM1cLmm0UpcX5nHtvags=; h=Date:From:To:Cc:Subject:From; b=ceS2iLLsFyMbhxsaoD2DWiCS35QLZHUdW8HSs9hsJJ7x4jreQ+qE68G0AIYt+5Yrx KVwiwF0imPXk+dfes9RjhYBpvOfvxUwpumb9Cg0e2HCGl5z2+fgG8LHoGGvoDEYPYx DxaqKSg5k3KJV8Jx8gd8XLg8hv4TYMghrMPKWINvNmHGNQliZOf9aAL2UmIHVwmEZC oZw+rhk7ZBVdcEmiWIqL1z+71o5h4SByhC0ROCQJ86Usqzj9kdVIAawGkTsGMhfsxX t46aDHMMzUfL2H4T7c46I0zHcX2osq5XL7ND93jhmAgu9J8aTVSJNb/2/mIY+tNec0 S+gFCOZ1tefuA== Date: Tue, 12 Dec 2023 11:14:29 -0600 From: "Gustavo A. R. Silva" To: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Shayne Chen , Sean Wang , Kalle Valo , Matthias Brugger , AngeloGioacchino Del Regno Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH v2][wireless-next/for-next] wifi: mt76: mt7996: Use DECLARE_FLEX_ARRAY() and fix -Warray-bounds warnings Message-ID: MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Transform zero-length arrays `rate`, `adm_stat` and `msdu_cnt` into proper flexible-array members in anonymous union in `struct mt7996_mcu_all_sta_info_event` via the DECLARE_FLEX_ARRAY() helper; and fix multiple -Warray-bounds warnings: drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:544:61: warning: array subs= cript is outside array bounds of 'struct [0]' [-Warray= -bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:551:58: warning: array subs= cript is outside array bounds of 'struct [0]' [-Warray= -bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:553:58: warning: array subs= cript is outside array bounds of 'struct [0]' [-Warray= -bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:530:61: warning: array subs= cript is outside array bounds of 'struct [0]' [-Warray= -bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:538:66: warning: array subs= cript is outside array bounds of 'struct [0]' [-Warray= -bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:540:66: warning: array subs= cript is outside array bounds of 'struct [0]' [-Warray= -bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:520:57: warning: array subs= cript is outside array bounds of 'struct all_sta_trx_rate[0]' [-W= array-bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:526:76: warning: array subs= cript is outside array bounds of 'struct all_sta_trx_rate[0]' [-W= array-bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:526:76: warning: array subs= cript is outside array bounds of 'struct all_sta_trx_rate[0]' [-W= array-bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:526:76: warning: array subs= cript is outside array bounds of 'struct all_sta_trx_rate[0]' [-W= array-bounds=3D] drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:526:76: warning: array subs= cript is outside array bounds of 'struct all_sta_trx_rate[0]' [-W= array-bounds=3D] This results in no differences in binary output, helps with the ongoing efforts to globally enable -Warray-bounds. Reviewed-by: Kees Cook Signed-off-by: Gustavo A. R. Silva --- Changes in v2: - Add Kees' RB tag. - Transform zero-length array `rate` into flex-array member. - Address five more -Warray-bounds warnings introduced by fake flexible array `rate` drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h b/drivers/net/= wireless/mediatek/mt76/mt7996/mcu.h index 3e013b20ee5e..36cacc495c75 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h @@ -206,20 +206,20 @@ struct mt7996_mcu_all_sta_info_event { u8 rsv3[4]; =20 union { - struct all_sta_trx_rate rate[0]; - struct { + DECLARE_FLEX_ARRAY(struct all_sta_trx_rate, rate); + DECLARE_FLEX_ARRAY(struct { __le16 wlan_idx; u8 rsv[2]; __le32 tx_bytes[IEEE80211_NUM_ACS]; __le32 rx_bytes[IEEE80211_NUM_ACS]; - } adm_stat[0] __packed; + } __packed, adm_stat); =20 - struct { + DECLARE_FLEX_ARRAY(struct { __le16 wlan_idx; u8 rsv[2]; __le32 tx_msdu_cnt; __le32 rx_msdu_cnt; - } msdu_cnt[0] __packed; + } __packed, msdu_cnt); } __packed; } __packed; =20 --=20 2.34.1