From patchwork Fri Nov 18 23:42:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 23110 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp487909wrr; Fri, 18 Nov 2022 16:44:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf7S86hMWvzw8Gnst5E5GfAA4ExtyUPZbrRmGttvwO7NzZvhj2nBk8/XVdFvfVaNmzhcpRG4 X-Received: by 2002:a17:906:e87:b0:78d:b88f:1548 with SMTP id p7-20020a1709060e8700b0078db88f1548mr8152028ejf.221.1668818666121; Fri, 18 Nov 2022 16:44:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818666; cv=none; d=google.com; s=arc-20160816; b=kXmUYP7bvkRUiNWId3mtCl5zKtpV6R6fXKhfI6aTdSeRWktdoknkqxRujrKJPxVduX WQlaBfz2AGA6RuSvnOaF0KSVobcrzxsY2n5iGF5QkEDPmLaOHeIIy4S1T0EVcdtPZSEi pjQvGCLRcAcmrhZvKSk2ZwhPrp/AMn9YfMAw55Fl658+XKCQ6E54kupIZ9kHS/awOBYu xRtDLhjUqGRhJtJO0LMKXlFg2w+LCLk7TRPCMpLlYrntdbq5reJ4yuq5LbE/3drwM9wC nyRMpH+CkecWnMTfxhibQUyO8ImYc8RPyGThYIrIeMb4xJpS8YWeU3Y2/UFxPzsJLvQD Q+JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gdy8THFQ217ArK5qAf8locqq0ea0wdI2wQ0KQQ2fz/s=; b=NtYNI2jl/x1n5Pg4lyXSRuS9C/fTVEXisFZ9B1FkF2ROwh5nGSwppptYR88tUDpEgK Wn6pNEvKL8ryzeqnk3dfvmsWUpdiQ1TaGErh4EFWuBNQO5OzhEdE16buBsiPod6sOCo/ P/ibVYtNYeneXaBIKIQvTZf1o2ia6I9sJpUGbfNRU6MUtyIYbFBTfW94bbO6wF8ml6AL tb/CnuTPJwjfL21s+K3jT58BuiQSD+PDSi1eX8nFlQzR2uuDWNCkx5gsqWlJexIcDOJ7 QBYvbT1P2r+ofusY0A/+hzbenHJIjQw7qMZDSqfwGEXMU2oILV0kgyQN98plpqZcBmP4 NsWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BxtRWJrH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id by25-20020a0564021b1900b00458ff6921e6si3908765edb.79.2022.11.18.16.43.54; Fri, 18 Nov 2022 16:44:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BxtRWJrH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232643AbiKSAei (ORCPT + 99 others); Fri, 18 Nov 2022 19:34:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231838AbiKSAeK (ORCPT ); Fri, 18 Nov 2022 19:34:10 -0500 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71EB62B624 for ; Fri, 18 Nov 2022 15:42:47 -0800 (PST) Received: by mail-pf1-x42b.google.com with SMTP id v28so6282257pfi.12 for ; Fri, 18 Nov 2022 15:42:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gdy8THFQ217ArK5qAf8locqq0ea0wdI2wQ0KQQ2fz/s=; b=BxtRWJrHgOasPDbyKA01nQReUZgzUZg6/4Bvt2wpUMbvtO/NzBRy4yb4K7NNnaui7z ZKoGcX+rZGZwaFdgXrnSa2czgwNPRRYNXG71hyg0aQ9HxMwIlmkn+NGMMTz5Y1m91xRw 6E5v8oz/mfPDQhfGbLbEdYGZ6/kBrnVXVXF3w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gdy8THFQ217ArK5qAf8locqq0ea0wdI2wQ0KQQ2fz/s=; b=ms77t148WH4FzvjVpCIiNZyQBmKQusvdO5KWYE21sLD+b82Fpv8RstVuL10KBqRgB3 n1kcxod+/15k4AHpytPVULx9CKtvs5im1OVJ8CBXY896B0rGaTnSFmevjzGpiQwI4RW+ eTFMa5dhL1XqEyIey4yUzWtCJMAgIRSirek4b5nDNwxlM/WXj3I25vzEljKOavrKh0AC jhPf3b4F7oc3ZtN7+HGmCYJm+KYc6oAkD6m+SV9MoVcCvveu+TZ2h4ZUZ4QxK0YR/4Dn A64OfwCdooz+ofzicI/K0hecBahEHAgLdbPMyXTJ0kFlcEqo4swDA9gDWt+EkSn69ZII 02fQ== X-Gm-Message-State: ANoB5pkQefaQc1jpfd8jXTwibNLTPAkZWHCgqZ19NAsp5YZhnEnnU+Ap 1kbneNCesw1R9E1UDmGuAAMPlEktlb04XQ== X-Received: by 2002:a63:e09:0:b0:46b:8e9:749 with SMTP id d9-20020a630e09000000b0046b08e90749mr8370837pgl.260.1668814966918; Fri, 18 Nov 2022 15:42:46 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id n14-20020a170902e54e00b00186c54188b4sm164191plf.240.2022.11.18.15.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 15:42:46 -0800 (PST) From: Kees Cook To: Christian Lamparter Cc: Kees Cook , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Gustavo A. R. Silva" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v2] p54: Replace zero-length array of trailing structs with flex-array Date: Fri, 18 Nov 2022 15:42:44 -0800 Message-Id: <20221118234240.gonna.369-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1744; h=from:subject:message-id; bh=frYwS/CNxid8oyzmUWma7Osq+zP62XTvZCZTt4IGeWs=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBjeBh0f9MnBuxNAcv8AF9IXJq5IQXcPhkrRYT3czBK XoiyBLGJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCY3gYdAAKCRCJcvTf3G3AJo5DEA CErDezf9uGBzeffXHVEc6KW5d8b6cJulenKDodro6pDA0mLJLYysESpyoAEe5dxT0q1pYdE0tzhV3S jWP0krg7whj91sCODp2jVmwPHK+fwU9/QiYarSJb+w3aAMuPx44QzBLTEWl9zbpjrPVTzuyVpVrftn jlGwx84wxKoeQdJGBF5in0GyzFLP/hVeLE4Zd+ntsc2BmVULzfrwNwqlN5I/4pAX0Q7zYwMyIVOR8j z5v64icaG0BGj5RLTZ7wauNbfIqOZST4aOTNwebR5VK0+zLAyYKg5OVjsfhVcaATEXiYfEzRq6L1xn qMzwjvXdv/0EzjBFV5b4UI5FOsAdQ0VWPc/qDCDZ+1z0TOs0LBuQTyLnxubd5HXz+kOxLDMjQqge3Q 3Mpr2qPcaVaqjRpAN1YNFhgli/fb3dK2GYf6VunwqdTSMTfEykk1vKWlJbpPX2nm2oNJFnk3aaRsFd m083OQZQZ+QOkekrxZ6oukm5qapc+LcBjy+/CWQhdzI1Yxr4S0m2IZ+nKfZpGBTSjI7rTEWS/iIJ6u GD/HrfqnStwjJjgGx/GRClHRWZ4roYUXubU4mEQ/9J55gTJ0VQvJvp7nUiS9ODC51JZxaWTFDogTXe elAmug2mMq8e8aQEfFbVhcAjCnBInU6Jt9iYU4uZeorSptPZtaZ8iJooDsgQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749883201641403692?= X-GMAIL-MSGID: =?utf-8?q?1749883201641403692?= 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 (most especially because struct pda_antenna_gain is unused). The struct is kept for future reference. [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 Acked-by: Christian Lamparter --- v2: - convert normally (chunkeey) v1: https://lore.kernel.org/lkml/20221118210639.never.072-kees@kernel.org/ --- drivers/net/wireless/intersil/p54/eeprom.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intersil/p54/eeprom.h b/drivers/net/wireless/intersil/p54/eeprom.h index 1d0aaf54389a..641c4e79879e 100644 --- a/drivers/net/wireless/intersil/p54/eeprom.h +++ b/drivers/net/wireless/intersil/p54/eeprom.h @@ -108,10 +108,10 @@ struct pda_country { } __packed; struct pda_antenna_gain { - struct { + DECLARE_FLEX_ARRAY(struct { u8 gain_5GHz; /* 0.25 dBi units */ u8 gain_2GHz; /* 0.25 dBi units */ - } __packed antenna[0]; + } __packed, antenna); } __packed; struct pda_custom_wrapper {