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 <k...@kernel.org>
---
 v1: https://lore.kernel.org/lkml/20250310222318.work.395-k...@kernel.org/
 v2: correctly split and fix subject
Cc: Johannes Berg <johan...@sipsolutions.net>
Cc: Eric Dumazet <eduma...@google.com>
Cc: En-Wei Wu <en-wei...@canonical.com>
Cc: Kalle Valo <kv...@kernel.org>
Cc: linux-wirel...@vger.kernel.org
---
 drivers/net/wireless/virtual/virt_wifi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/virtual/virt_wifi.c 
b/drivers/net/wireless/virtual/virt_wifi.c
index 4ee374080466..fc122b79301a 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,
-- 
2.34.1


Reply via email to