[PATCH] scripts/mkimage: Fix strncpy usage

[PATCH] scripts/mkimage: Fix strncpy usage

[Andrey Smirnov]

Original code produces the following warning when compiled with GCC8:

  HOSTCC  scripts/mkimage
In function ‘image_set_name’,
    inlined from ‘main’ at scripts/mkimage.c:614:2:
scripts/mkimage.c:153:2: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation]
  strncpy(image_get_name(hdr), name, IH_NMLEN);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

reduce specified bound by one to make sure that NULL-terminator is
never overwritten.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 scripts/mkimage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mkimage.c b/scripts/mkimage.c
index c7267a2d1..891d7b6de 100644
--- a/scripts/mkimage.c
+++ b/scripts/mkimage.c
@@ -150,7 +150,7 @@ image_set_hdr_u8(comp);		/* image_set_comp */
 
 static inline void image_set_name(image_header_t *hdr, const char *name)
 {
-	strncpy(image_get_name(hdr), name, IH_NMLEN);
+	strncpy(image_get_name(hdr), name, IH_NMLEN - 1);
 }
 
 /**
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] scripts/mkimage: Fix strncpy usage

[Sascha Hauer]

On Tue, May 22, 2018 at 03:26:44PM -0700, Andrey Smirnov wrote:
> Original code produces the following warning when compiled with GCC8:
> 
>   HOSTCC  scripts/mkimage
> In function ‘image_set_name’,
>     inlined from ‘main’ at scripts/mkimage.c:614:2:
> scripts/mkimage.c:153:2: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation]
>   strncpy(image_get_name(hdr), name, IH_NMLEN);
>   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> reduce specified bound by one to make sure that NULL-terminator is
> never overwritten.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
>  scripts/mkimage.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/scripts/mkimage.c b/scripts/mkimage.c
> index c7267a2d1..891d7b6de 100644
> --- a/scripts/mkimage.c
> +++ b/scripts/mkimage.c
> @@ -150,7 +150,7 @@ image_set_hdr_u8(comp);		/* image_set_comp */
>  
>  static inline void image_set_name(image_header_t *hdr, const char *name)
>  {
> -	strncpy(image_get_name(hdr), name, IH_NMLEN);
> +	strncpy(image_get_name(hdr), name, IH_NMLEN - 1);
>  }
>  
>  /**
> -- 
> 2.17.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox