[PATCH] watchdog: exar: Shorten identity name to fit correctly

[PATCH] watchdog: exar: Shorten identity name to fit correctly

[Kees Cook]

The static initializer for struct watchdog_info::identity is too long
and gets initialized without a trailing NUL byte. Since the length
of "identity" is part of UAPI and tied to ioctls, just shorten
the name of the device. Avoids the warning seen with GCC 15's
-Wunterminated-string-initialization option:

drivers/watchdog/exar_wdt.c:224:27: warning: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (33 chars into 32 available) [-Wunterminated-string-initialization]
  224 |         .identity       = "Exar/MaxLinear XR28V38x Watchdog",
      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fixes: 81126222bd3a ("watchdog: Exar/MaxLinear XR28V38x driver")
Signed-off-by: Kees Cook <kees@kernel.org>
---
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org
---
 drivers/watchdog/exar_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/exar_wdt.c b/drivers/watchdog/exar_wdt.c
index 7c61ff343271..c2e3bb08df89 100644
--- a/drivers/watchdog/exar_wdt.c
+++ b/drivers/watchdog/exar_wdt.c
@@ -221,7 +221,7 @@ static const struct watchdog_info exar_wdt_info = {
 	.options	= WDIOF_KEEPALIVEPING |
 			  WDIOF_SETTIMEOUT |
 			  WDIOF_MAGICCLOSE,
-	.identity	= "Exar/MaxLinear XR28V38x Watchdog",
+	.identity	= "Exar XR28V38x Watchdog",
 };
 
 static const struct watchdog_ops exar_wdt_ops = {
-- 
2.34.1

Re: [PATCH] watchdog: exar: Shorten identity name to fit correctly

[Guenter Roeck]

On 4/15/25 15:52, Kees Cook wrote:
> The static initializer for struct watchdog_info::identity is too long
> and gets initialized without a trailing NUL byte. Since the length
> of "identity" is part of UAPI and tied to ioctls, just shorten
> the name of the device. Avoids the warning seen with GCC 15's
> -Wunterminated-string-initialization option:
> 
> drivers/watchdog/exar_wdt.c:224:27: warning: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (33 chars into 32 available) [-Wunterminated-string-initialization]
>    224 |         .identity       = "Exar/MaxLinear XR28V38x Watchdog",
>        |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Fixes: 81126222bd3a ("watchdog: Exar/MaxLinear XR28V38x driver")
> Signed-off-by: Kees Cook <kees@kernel.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-watchdog@vger.kernel.org
> ---
>   drivers/watchdog/exar_wdt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/exar_wdt.c b/drivers/watchdog/exar_wdt.c
> index 7c61ff343271..c2e3bb08df89 100644
> --- a/drivers/watchdog/exar_wdt.c
> +++ b/drivers/watchdog/exar_wdt.c
> @@ -221,7 +221,7 @@ static const struct watchdog_info exar_wdt_info = {
>   	.options	= WDIOF_KEEPALIVEPING |
>   			  WDIOF_SETTIMEOUT |
>   			  WDIOF_MAGICCLOSE,
> -	.identity	= "Exar/MaxLinear XR28V38x Watchdog",
> +	.identity	= "Exar XR28V38x Watchdog",
>   };
>   
>   static const struct watchdog_ops exar_wdt_ops = {