linux-kernel - [PATCH v2] wifi: zd1211rw: 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>] [day] [month] [year] [list]

Message-Id: <20250311225513.it.620-kees@kernel.org>
Date: Tue, 11 Mar 2025 15:55:20 -0700
From: Kees Cook <kees@...nel.org>
To: Johannes Berg <johannes@...solutions.net>
Cc: Kees Cook <kees@...nel.org>,
	Miri Korenblit <miriam.rachel.korenblit@...el.com>,
	Alexander Wetzel <alexander@...zel-home.de>,
	Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
	Shaul Triebitz <shaul.triebitz@...el.com>,
	linux-wireless@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	linux-hardening@...r.kernel.org
Subject: [PATCH v2] wifi: zd1211rw: 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]
Signed-off-by: Kees Cook <kees@...nel.org>
---
 v1: https://lore.kernel.org/lkml/20250310222318.work.395-kees@kernel.org/
 v2: correctly split and fix subject
Cc: Johannes Berg <johannes@...solutions.net>
Cc: Miri Korenblit <miriam.rachel.korenblit@...el.com>
Cc: Alexander Wetzel <alexander@...zel-home.de>
Cc: Emmanuel Grumbach <emmanuel.grumbach@...el.com>
Cc: Shaul Triebitz <shaul.triebitz@...el.com>
Cc: linux-wireless@...r.kernel.org
---
 drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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