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 1FCAFC433FE for ; Fri, 18 Nov 2022 22:34:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbiKRWe0 (ORCPT ); Fri, 18 Nov 2022 17:34:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbiKRWeY (ORCPT ); Fri, 18 Nov 2022 17:34:24 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38C4788FB5; Fri, 18 Nov 2022 14:34:24 -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 ams.source.kernel.org (Postfix) with ESMTPS id 005B9B81F4F; Fri, 18 Nov 2022 22:34:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B0AFC433D6; Fri, 18 Nov 2022 22:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668810861; bh=akSlpHkxuHMmNNIBeOEp7Zb57LHGrS2/uHHPtnfozMc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UPSFy/4L1Nj8b4ahyj/NatcSZwKUmkn566AgEbL/ZkVCztYl0d9nn8J6m/hNJgkHa Uoc3FUoBC9sOH+VBZfLhDztm7cvA4HM3XCTwDzhAIfU7Z2Tuc9Pk0NuFhtoyv89V9N lNpV+BDqpbcv0UPr2DTq5uaReNG/ny5JLIGCKoh7zjxyKd/+MBvwehCwJdqUKpyokB rXmgPQQRgLQbjz9zpKgRckzoAWBWC97/bq6wS07pdZwROYyWwpO1DfzW4ZzS0+vld1 QZ3xCPBng0BVpdZQEOUpn3gpXcy9HBZOq6JNt+nZoXMgK52qNpeMznm8uiY1G/jWDk 1Ed334esEXX2A== Date: Fri, 18 Nov 2022 16:34:08 -0600 From: "Gustavo A. R. Silva" To: Kees Cook Cc: Christian Lamparter , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH] carl9170: Replace zero-length array of trailing structs with flex-array Message-ID: References: <20221118211146.never.395-kees@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221118211146.never.395-kees@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Fri, Nov 18, 2022 at 01:11:47PM -0800, Kees Cook wrote: > Zero-length arrays are deprecated[1] and are being replaced with > flexible array members in support of the ongoing efforts to tighten the > FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing > with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3. > > Replace zero-length array with flexible-array member. > > This results in no differences in binary output. > > [1] https://github.com/KSPP/linux/issues/78 > > Cc: Christian Lamparter > Cc: Kalle Valo > Cc: "David S. Miller" > Cc: Eric Dumazet > Cc: Jakub Kicinski > Cc: Paolo Abeni > Cc: "Gustavo A. R. Silva" > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Signed-off-by: Kees Cook Another sneaky one. :p Reviewed-by: Gustavo A. R. Silva Thanks! -- Gustavo > --- > drivers/net/wireless/ath/carl9170/fwcmd.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/ath/carl9170/fwcmd.h b/drivers/net/wireless/ath/carl9170/fwcmd.h > index 4a500095555c..ff4b3b50250c 100644 > --- a/drivers/net/wireless/ath/carl9170/fwcmd.h > +++ b/drivers/net/wireless/ath/carl9170/fwcmd.h > @@ -118,10 +118,10 @@ struct carl9170_reg_list { > } __packed; > > struct carl9170_write_reg { > - struct { > + DECLARE_FLEX_ARRAY(struct { > __le32 addr; > __le32 val; > - } regs[0] __packed; > + } __packed, regs); > } __packed; > > struct carl9170_write_reg_byte { > -- > 2.34.1 >