]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: zd1211rw: Add __nonstring annotations for unterminated strings
authorKees Cook <kees@kernel.org>
Tue, 11 Mar 2025 22:55:20 +0000 (15:55 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 12 Mar 2025 08:48:22 +0000 (09:48 +0100)
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
Signed-off-by: Kees Cook <kees@kernel.org>
Link: https://patch.msgid.link/20250311225513.it.620-kees@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/zydas/zd1211rw/zd_mac.c

index f90c33d19b39938a5705185cbde9e27288fbdc88..9653dbaac3c0590338f340e134146c7ca62ff2e8 100644 (file)
@@ -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[] = {