summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2018-07-12 21:25:34 -0400
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2018-07-15 06:38:06 -0400
commitcd570e6fa43a5ed061b91e64dc507a6ac54fac95 (patch)
treedbd7b46f4e4235596931d3537ff9572376f7fea5 /drivers
parentef89f4b96a2ab8dc1a0a3815d9365240e4c3c06b (diff)
iio: change strncpy+truncation to strlcpy
Generated by scripts/coccinelle/misc/strncpy_truncation.cocci Signed-off-by: Dominique Martinet <asmadeus@codewreck.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iio/common/st_sensors/st_sensors_core.c3
-rw-r--r--drivers/iio/pressure/st_pressure_i2c.c3
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,
380 return; 380 return;
381 381
382 /* The name from the OF match takes precedence if present */ 382 /* The name from the OF match takes precedence if present */
383 strncpy(name, of_id->data, len); 383 strlcpy(name, of_id->data, len);
384 name[len - 1] = '\0';
385} 384}
386EXPORT_SYMBOL(st_sensors_of_name_probe); 385EXPORT_SYMBOL(st_sensors_of_name_probe);
387#else 386#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,
94 if ((ret < 0) || (ret >= ST_PRESS_MAX)) 94 if ((ret < 0) || (ret >= ST_PRESS_MAX))
95 return -ENODEV; 95 return -ENODEV;
96 96
97 strncpy(client->name, st_press_id_table[ret].name, 97 strlcpy(client->name, st_press_id_table[ret].name,
98 sizeof(client->name)); 98 sizeof(client->name));
99 client->name[sizeof(client->name) - 1] = '\0';
100 } else if (!id) 99 } else if (!id)
101 return -ENODEV; 100 return -ENODEV;
102 101