Skip to content

Commit

Permalink
leds: do not overflow sysfs buffer in led_trigger_show
Browse files Browse the repository at this point in the history
Per the documentation, use scnprintf instead of sprintf to ensure there
is never more than PAGE_SIZE bytes of trigger names put into the
buffer.

Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: Zach Brown <zach.brown@ni.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
  • Loading branch information
Nathan Sullivan authored and Jacek Anaszewski committed Aug 16, 2016
1 parent 5023786 commit 3b9b953
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/leds/led-triggers.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,23 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
down_read(&led_cdev->trigger_lock);

if (!led_cdev->trigger)
len += sprintf(buf+len, "[none] ");
len += scnprintf(buf+len, PAGE_SIZE - len, "[none] ");
else
len += sprintf(buf+len, "none ");
len += scnprintf(buf+len, PAGE_SIZE - len, "none ");

list_for_each_entry(trig, &trigger_list, next_trig) {
if (led_cdev->trigger && !strcmp(led_cdev->trigger->name,
trig->name))
len += sprintf(buf+len, "[%s] ", trig->name);
len += scnprintf(buf+len, PAGE_SIZE - len, "[%s] ",
trig->name);
else
len += sprintf(buf+len, "%s ", trig->name);
len += scnprintf(buf+len, PAGE_SIZE - len, "%s ",
trig->name);
}
up_read(&led_cdev->trigger_lock);
up_read(&triggers_list_lock);

len += sprintf(len+buf, "\n");
len += scnprintf(len+buf, PAGE_SIZE - len, "\n");
return len;
}
EXPORT_SYMBOL_GPL(led_trigger_show);
Expand Down

0 comments on commit 3b9b953

Please sign in to comment.