Re: [PATCH 05/18] iio: change strncpy+truncation to strlcpy

[Jonathan Cameron]

On Fri, 13 Jul 2018 03:25:34 +0200
Dominique Martinet <asmadeus@xxxxxxxxxxxxx> wrote:

> Generated by scripts/coccinelle/misc/strncpy_truncation.cocci
> 
> Signed-off-by: Dominique Martinet <asmadeus@xxxxxxxxxxxxx>

Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan
> ---
> 
> Please see https://marc.info/?l=linux-kernel&m=153144450722324&w=2 (the
> first patch of the serie) for the motivation behind this patch
> 
>  drivers/iio/common/st_sensors/st_sensors_core.c | 3 +--
>  drivers/iio/pressure/st_pressure_i2c.c          | 3 +--
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
> index 57db19182e95..26fbd1bd9413 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_core.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_core.c
> @@ -380,8 +380,7 @@ void st_sensors_of_name_probe(struct device *dev,
>  		return;
>  
>  	/* The name from the OF match takes precedence if present */
> -	strncpy(name, of_id->data, len);
> -	name[len - 1] = '\0';
> +	strlcpy(name, of_id->data, len);
>  }
>  EXPORT_SYMBOL(st_sensors_of_name_probe);
>  #else
> diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
> index fbb59059e942..2026a1012012 100644
> --- a/drivers/iio/pressure/st_pressure_i2c.c
> +++ b/drivers/iio/pressure/st_pressure_i2c.c
> @@ -94,9 +94,8 @@ static int st_press_i2c_probe(struct i2c_client *client,
>  		if ((ret < 0) || (ret >= ST_PRESS_MAX))
>  			return -ENODEV;
>  
> -		strncpy(client->name, st_press_id_table[ret].name,
> +		strlcpy(client->name, st_press_id_table[ret].name,
>  				sizeof(client->name));
> -		client->name[sizeof(client->name) - 1] = '\0';
>  	} else if (!id)
>  		return -ENODEV;
>