]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: carl9170: Add __nonstring annotations for unterminated strings
authorKees Cook <kees@kernel.org>
Mon, 10 Mar 2025 22:23:40 +0000 (15:23 -0700)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Mon, 17 Mar 2025 17:24:00 +0000 (10:24 -0700)
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
Cc: Christian Lamparter <chunkeey@googlemail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
Acked-by: Christian Lamparter <chunkeey@gmail.com>
Link: https://patch.msgid.link/20250310222339.work.654-kees@kernel.org
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/carl9170/fw.c

index 4c1aecd1163cee707f576902a255fc8afee03784..419f5530f885c27f3423f75fea85698040ea6a34 100644 (file)
@@ -15,7 +15,7 @@
 #include "fwcmd.h"
 #include "version.h"
 
-static const u8 otus_magic[4] = { OTUS_MAGIC };
+static const u8 otus_magic[4] __nonstring = { OTUS_MAGIC };
 
 static const void *carl9170_fw_find_desc(struct ar9170 *ar, const u8 descid[4],
        const unsigned int len, const u8 compatible_revision)