Commit bf4a35e9 authored by Azeem Shaikh's avatar Azeem Shaikh Committed by Lee Jones
Browse files

leds: Replace all non-returning strlcpy with strscpy 

strlcpy() reads the entire source buffer first.
This read may exceed the destination size limit.
This is both inefficient and can lead to linear read
overflows if a source string is not NUL-terminated [1].
In an effort to remove strlcpy() completely [2], replace
strlcpy() here with strscpy().
No return values were used, so direct replacement is safe.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89



Signed-off-by: default avatarAzeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230523021451.2406362-1-azeemshaikh38@gmail.com


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent d6e3896b

drivers/leds/flash/leds-aat1290.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -425,7 +425,7 @@ static void aat1290_init_v4l2_flash_config(struct aat1290_led *led, 
	struct led_classdev *led_cdev = &led->fled_cdev.led_cdev;

	struct led_classdev *led_cdev = &led->fled_cdev.led_cdev;

	struct led_flash_setting *s;

	struct led_flash_setting *s;





	strlcpy(v4l2_sd_cfg->dev_name, led_cdev->dev->kobj.name,

	strscpy(v4l2_sd_cfg->dev_name, led_cdev->dev->kobj.name,

		sizeof(v4l2_sd_cfg->dev_name));

		sizeof(v4l2_sd_cfg->dev_name));





	s = &v4l2_sd_cfg->intensity;

	s = &v4l2_sd_cfg->intensity;

drivers/leds/led-class.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -409,7 +409,7 @@ static int led_classdev_next_name(const char *init_name, char *name, 
	int ret = 0;

	int ret = 0;

	struct device *dev;

	struct device *dev;





	strlcpy(name, init_name, len);

	strscpy(name, init_name, len);





	while ((ret < len) &&

	while ((ret < len) &&

	       (dev = class_find_device_by_name(leds_class, name))) {

	       (dev = class_find_device_by_name(leds_class, name))) {

drivers/leds/leds-spi-byte.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ static int spi_byte_probe(struct spi_device *spi) 
		return -ENOMEM;

		return -ENOMEM;





	of_property_read_string(child, "label", &name);

	of_property_read_string(child, "label", &name);

	strlcpy(led->name, name, sizeof(led->name));

	strscpy(led->name, name, sizeof(led->name));

	led->spi = spi;

	led->spi = spi;

	mutex_init(&led->mutex);

	mutex_init(&led->mutex);

	led->cdef = device_get_match_data(dev);

	led->cdef = device_get_match_data(dev);