From: Kees Cook Date: Tue, 11 Mar 2025 22:56:05 +0000 (-0700) Subject: wifi: virt_wifi: Add __nonstring annotations for unterminated strings X-Git-Tag: v6.15-rc1~160^2~20^2~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adb1ee4de04d496f3da409bb6791cfdd744ab2c3;p=thirdparty%2Fkernel%2Flinux.git wifi: virt_wifi: 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 Link: https://patch.msgid.link/20250311225604.it.926-kees@kernel.org Signed-off-by: Johannes Berg --- diff --git a/drivers/net/wireless/virtual/virt_wifi.c b/drivers/net/wireless/virtual/virt_wifi.c index f9d11a0233136..1fffeff2190ca 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,