netdev - [PATCH] wifi: mac80211: Add __nonstring annotations for unterminated strings

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20250310222318.work.395-kees@kernel.org>
Date: Mon, 10 Mar 2025 15:23:19 -0700
From: Kees Cook <kees@...nel.org>
To: Andrew Lunn <andrew+netdev@...n.ch>
Cc: Kees Cook <kees@...nel.org>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Johannes Berg <johannes@...solutions.net>,
	Kalle Valo <kvalo@...nel.org>,
	Julia Lawall <Julia.Lawall@...ia.fr>,
	En-Wei Wu <en-wei.wu@...onical.com>,
	Shaul Triebitz <shaul.triebitz@...el.com>,
	Alexander Wetzel <alexander@...zel-home.de>,
	Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
	linux-wireless@...r.kernel.org,
	netdev@...r.kernel.org,
	kernel test robot <lkp@...el.com>,
	Miri Korenblit <miriam.rachel.korenblit@...el.com>,
	linux-kernel@...r.kernel.org,
	syzbot+d6eb9cee2885ec06f5e3@...kaller.appspotmail.com,
	linux-hardening@...r.kernel.org
Subject: [PATCH] wifi: mac80211: Add __nonstring annotations for unterminated strings

When a character array without a terminating NUL character has a static
initializer, GCC 15's -Wunterminated-string-initialization will only
warn if the array lacks the "nonstring" attribute[1]. Mark the arrays
with __nonstring to and correctly identify the char array as "not a C
string" and thereby eliminate the warning.

Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1]
Cc: Andrew Lunn <andrew+netdev@...n.ch>
Cc: "David S. Miller" <davem@...emloft.net>
Cc: Eric Dumazet <edumazet@...gle.com>
Cc: Jakub Kicinski <kuba@...nel.org>
Cc: Paolo Abeni <pabeni@...hat.com>
Cc: Johannes Berg <johannes@...solutions.net>
Cc: Kalle Valo <kvalo@...nel.org>
Cc: Julia Lawall <Julia.Lawall@...ia.fr>
Cc: En-Wei Wu <en-wei.wu@...onical.com>
Cc: Shaul Triebitz <shaul.triebitz@...el.com>
Cc: Alexander Wetzel <alexander@...zel-home.de>
Cc: Emmanuel Grumbach <emmanuel.grumbach@...el.com>
Cc: linux-wireless@...r.kernel.org
Cc: netdev@...r.kernel.org
Signed-off-by: Kees Cook <kees@...nel.org>
---
 drivers/net/wireless/virtual/virt_wifi.c     | 2 +-
 drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/virtual/virt_wifi.c b/drivers/net/wireless/virtual/virt_wifi.c
index 4ee374080466..fc122b79301a 100644
--- a/drivers/net/wireless/virtual/virt_wifi.c
+++ b/drivers/net/wireless/virtual/virt_wifi.c
@@ -146,7 +146,7 @@ static void virt_wifi_inform_bss(struct wiphy *wiphy)
 	static const struct {
 		u8 tag;
 		u8 len;
-		u8 ssid[8];
+		u8 ssid[8] __nonstring;
 	} __packed ssid = {
 		.tag = WLAN_EID_SSID,
 		.len = VIRT_WIFI_SSID_LEN,
diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
index f90c33d19b39..9653dbaac3c0 100644
--- a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
@@ -21,7 +21,7 @@
 
 struct zd_reg_alpha2_map {
 	u32 reg;
-	char alpha2[2];
+	char alpha2[2] __nonstring;
 };
 
 static struct zd_reg_alpha2_map reg_alpha2_map[] = {
-- 
2.34.1