Re: [PATCH] s390: scsi: zfcp_aux.c: Cleaning up missing null-terminate after strncpy call

From: Heiko Carstens
Date: Wed Jun 04 2014 - 17:59:25 EST


On Wed, Jun 04, 2014 at 11:31:11PM +0200, Rickard Strandqvist wrote:
> Added a guaranteed null-terminate after call to strncpy.
>
> This was partly found using a static code analysis program called cppcheck.
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/s390/scsi/zfcp_aux.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
> index 8004b07..138b84a 100644
> --- a/drivers/s390/scsi/zfcp_aux.c
> +++ b/drivers/s390/scsi/zfcp_aux.c
> @@ -102,6 +102,7 @@ static void __init zfcp_init_device_setup(char *devstr)
> if (!token || strlen(token) >= ZFCP_BUS_ID_SIZE)
> goto err_out;
> strncpy(busid, token, ZFCP_BUS_ID_SIZE);
> + busid[sizeof(busid) - 1] = '\0';

Erm.. with
char busid[ZFCP_BUS_ID_SIZE];
just a couple of lines above this seems to be rather pointless.
However _if_ we change the code then replacing strncpy() with strlcpy()
would be the way to go.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/