Commit dff485e3 authored by Nathan Sullivan's avatar Nathan Sullivan Committed by Greg Kroah-Hartman

leds: do not overflow sysfs buffer in led_trigger_show

commit 3b9b9536 upstream.

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: default avatarNathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: default avatarZach Brown <zach.brown@ni.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Cc: Willy Tarreau <w@1wt.eu>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6bde0940
...@@ -88,21 +88,23 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr, ...@@ -88,21 +88,23 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
down_read(&led_cdev->trigger_lock); down_read(&led_cdev->trigger_lock);
if (!led_cdev->trigger) if (!led_cdev->trigger)
len += sprintf(buf+len, "[none] "); len += scnprintf(buf+len, PAGE_SIZE - len, "[none] ");
else else
len += sprintf(buf+len, "none "); len += scnprintf(buf+len, PAGE_SIZE - len, "none ");
list_for_each_entry(trig, &trigger_list, next_trig) { list_for_each_entry(trig, &trigger_list, next_trig) {
if (led_cdev->trigger && !strcmp(led_cdev->trigger->name, if (led_cdev->trigger && !strcmp(led_cdev->trigger->name,
trig->name)) trig->name))
len += sprintf(buf+len, "[%s] ", trig->name); len += scnprintf(buf+len, PAGE_SIZE - len, "[%s] ",
trig->name);
else 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(&led_cdev->trigger_lock);
up_read(&triggers_list_lock); up_read(&triggers_list_lock);
len += sprintf(len+buf, "\n"); len += scnprintf(len+buf, PAGE_SIZE - len, "\n");
return len; return len;
} }
EXPORT_SYMBOL_GPL(led_trigger_show); EXPORT_SYMBOL_GPL(led_trigger_show);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment