Skip to content

Commit 259e33c

Browse files
Ansuellag-linaro
authored andcommitted
leds: trigger: netdev: Move size check in set_device_name
GCC 13.2 complains about array subscript 17 is above array bounds of 'char[16]' with IFNAMSIZ set to 16. The warning is correct but this scenario is impossible. set_device_name is called by device_name_store (store sysfs entry) and netdev_trig_activate. device_name_store already check if size is >= of IFNAMSIZ and return -EINVAL. (making the warning scenario impossible) netdev_trig_activate works on already defined interface, where the name has already been checked and should already follow the condition of strlen() < IFNAMSIZ. Aside from the scenario being impossible, set_device_name can be improved to both mute the warning and make the function safer. To make it safer, move size check from device_name_store directly to set_device_name and prevent any out of bounds scenario. Cc: [email protected] Fixes: 28a6a2e ("leds: trigger: netdev: refactor code setting device name") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Signed-off-by: Christian Marangi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 0ebdb72 commit 259e33c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/leds/trigger/ledtrig-netdev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@ static ssize_t device_name_show(struct device *dev,
221221
static int set_device_name(struct led_netdev_data *trigger_data,
222222
const char *name, size_t size)
223223
{
224+
if (size >= IFNAMSIZ)
225+
return -EINVAL;
226+
224227
cancel_delayed_work_sync(&trigger_data->work);
225228

226229
mutex_lock(&trigger_data->lock);
@@ -263,9 +266,6 @@ static ssize_t device_name_store(struct device *dev,
263266
struct led_netdev_data *trigger_data = led_trigger_get_drvdata(dev);
264267
int ret;
265268

266-
if (size >= IFNAMSIZ)
267-
return -EINVAL;
268-
269269
ret = set_device_name(trigger_data, buf, size);
270270

271271
if (ret < 0)

0 commit comments

Comments
 (0)