From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-hardening@vger.kernel.org
Subject: [PATCH][next] staging: wlan-ng: Replace one-element arrays with flexible-array members
Date: Fri, 4 Feb 2022 17:30:15 -0600 [thread overview]
Message-ID: <20220204233015.GA454979@embeddedor> (raw)
There is a regular need in the kernel to provide a way to declare having
a dynamically sized set of trailing elements in a structure. Kernel code
should always use “flexible array members”[1] for these cases. The older
style of one-element or zero-length arrays should no longer be used[2].
This helps with the ongoing efforts to globally enable -Warray-bounds
and get us closer to being able to tighten the FORTIFY_SOURCE routines
on memcpy().
This issue was found with the help of Coccinelle and audited and fixed,
manually.
[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-and-one-element-arrays
Link: https://github.com/KSPP/linux/issues/79
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/staging/wlan-ng/p80211mgmt.h | 8 ++++----
drivers/staging/wlan-ng/p80211types.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index 1ef30d3f3159..d6fe52de2c8f 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -229,14 +229,14 @@ struct wlan_ie {
struct wlan_ie_ssid {
u8 eid;
u8 len;
- u8 ssid[1]; /* may be zero, ptrs may overlap */
+ u8 ssid[]; /* may be zero, ptrs may overlap */
} __packed;
/*-- Supported Rates -----------------------------*/
struct wlan_ie_supp_rates {
u8 eid;
u8 len;
- u8 rates[1]; /* had better be at LEAST one! */
+ u8 rates[]; /* had better be at LEAST one! */
} __packed;
/*-- FH Parameter Set ----------------------------*/
@@ -274,7 +274,7 @@ struct wlan_ie_tim {
u8 dtim_cnt;
u8 dtim_period;
u8 bitmap_ctl;
- u8 virt_bm[1];
+ u8 virt_bm[];
} __packed;
/*-- IBSS Parameter Set ---------------------------*/
@@ -288,7 +288,7 @@ struct wlan_ie_ibss_parms {
struct wlan_ie_challenge {
u8 eid;
u8 len;
- u8 challenge[1];
+ u8 challenge[];
} __packed;
/*-------------------------------------------------*/
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index 6486612a8f31..b2ffd09881b0 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -234,7 +234,7 @@ struct p80211pstr32 {
/* MAC address array */
struct p80211macarray {
u32 cnt;
- u8 data[1][MAXLEN_PSTR6];
+ u8 data[][MAXLEN_PSTR6];
} __packed;
/* prototype template */
--
2.27.0
next reply other threads:[~2022-02-04 23:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 23:30 Gustavo A. R. Silva [this message]
2022-02-07 7:33 ` [PATCH][next] staging: wlan-ng: Replace one-element arrays with flexible-array members Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220204233015.GA454979@embeddedor \
--to=gustavoars@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).