From: Kees Cook Date: Mon, 10 Mar 2025 22:23:40 +0000 (-0700) Subject: wifi: carl9170: Add __nonstring annotations for unterminated strings X-Git-Tag: v6.16-rc1~132^2~157^2~16^2~99 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a1cf85c9c7cca15bfc452f207818977621dedf8;p=thirdparty%2Fkernel%2Flinux.git wifi: carl9170: 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: Christian Lamparter Cc: Johannes Berg Cc: linux-wireless@vger.kernel.org Signed-off-by: Kees Cook Acked-by: Christian Lamparter Link: https://patch.msgid.link/20250310222339.work.654-kees@kernel.org Signed-off-by: Jeff Johnson --- diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c index 4c1aecd1163ce..419f5530f885c 100644 --- a/drivers/net/wireless/ath/carl9170/fw.c +++ b/drivers/net/wireless/ath/carl9170/fw.c @@ -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)