]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: virt_wifi: Add __nonstring annotations for unterminated strings
authorKees Cook <kees@kernel.org>
Tue, 11 Mar 2025 22:56:05 +0000 (15:56 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 12 Mar 2025 08:48:28 +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/20250311225604.it.926-kees@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/virtual/virt_wifi.c

index f9d11a0233136a0b878c89f872b4094939af2ed5..1fffeff2190ca8df6ca54c7151f6b187c0e65872 100644 (file)
@@ -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,