* [PATCH v2] wifi: zd1211rw: Add __nonstring annotations for unterminated strings
@ 2025-03-11 22:55 Kees Cook
0 siblings, 0 replies; only message in thread
From: Kees Cook @ 2025-03-11 22:55 UTC (permalink / raw)
To: Johannes Berg
Cc: Kees Cook, Miri Korenblit, Alexander Wetzel, Emmanuel Grumbach,
Shaul Triebitz, linux-wireless, linux-kernel, linux-hardening
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@kernel.org>
---
v1: https://lore.kernel.org/lkml/20250310222318.work.395-kees@kernel.org/
v2: correctly split and fix subject
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Cc: Alexander Wetzel <alexander@wetzel-home.de>
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Cc: Shaul Triebitz <shaul.triebitz@intel.com>
Cc: linux-wireless@vger.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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-03-11 22:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-11 22:55 [PATCH v2] wifi: zd1211rw: Add __nonstring annotations for unterminated strings Kees Cook
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).