[PATCH] wifi: carl9170: Add __nonstring annotations for unterminated strings

[PATCH] wifi: carl9170: Add __nonstring annotations for unterminated strings

[Kees Cook]

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 <chunkeey@googlemail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
---
 drivers/net/wireless/ath/carl9170/fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 4c1aecd1163c..419f5530f885 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)
-- 
2.34.1

Re: [PATCH] wifi: carl9170: Add __nonstring annotations for unterminated strings

[Christian Lamparter]

On 3/10/25 11:23 PM, Kees Cook wrote:
> 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.

Sure. Thank you!

> Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1]
> 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>
> ---
>   drivers/net/wireless/ath/carl9170/fw.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
> index 4c1aecd1163c..419f5530f885 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)

Re: [PATCH] wifi: carl9170: Add __nonstring annotations for unterminated strings

[Jeff Johnson]

On Mon, 10 Mar 2025 15:23:40 -0700, Kees Cook wrote:
> 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.
> 
> 
> [...]

Applied, thanks!

[1/1] wifi: carl9170: Add __nonstring annotations for unterminated strings
      commit: 9a1cf85c9c7cca15bfc452f207818977621dedf8

Best regards,
-- 
Jeff Johnson <jeff.johnson@oss.qualcomm.com>