浏览代码

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>
Dominique Martinet 7 年之前
父节点
当前提交
cd570e6fa4
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 1 2
      drivers/iio/common/st_sensors/st_sensors_core.c
  2. 1 2
      drivers/iio/pressure/st_pressure_i2c.c

+ 1 - 2
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

+ 1 - 2
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;