Skip to contentSkip to conversation

wifi: rtw88: Add __nonstring annotations for unterminated strings

PATCH In review Kees Cook 2 participants 2 messages Mar 10, 2025 – Mar 13, 2025 Realtek wireless driver (rtw88)

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 wifi: rtw88: 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 Ping-Ke Shih <[email protected]>
Cc Johannes Berg <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/net/wireless/realtek/rtw88/main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/main.h +1 -1
index 62cd4c526301..5d6df6b51698 100644
@@ -822,7 +822,7 @@ struct rtw_vif {
 };
 
 struct rtw_regulatory {
-	char alpha2[2];
+	char alpha2[2] __nonstring;
 	u8 txpwr_regd_2g;
 	u8 txpwr_regd_5g;
 };
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 11 lines · Kees Cook

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 Ping-Ke Shih <[email protected]>
Cc Johannes Berg <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>

1 patch(es) applied to rtw-next branch of rtw.git, thanks.

d58ad77d5cc2 wifi: rtw88: Add __nonstring annotations for unterminated strings

---
https://github.com/pkshih/rtw.git