diff options
author | Nathan Sullivan <nathan.sullivan@ni.com> | 2016-08-15 18:20:14 -0400 |
---|---|---|
committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2016-08-16 15:34:30 -0400 |
commit | 3b9b95363c45365d606ad4bbba16acca75fdf6d3 (patch) | |
tree | 6ef4e80e14ad3eec71611883e4cd034c74aa651d | |
parent | 50237863c4edd9c342b522d8edfedf23b20d4a21 (diff) |
leds: do not overflow sysfs buffer in led_trigger_show
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>
-rw-r--r-- | drivers/leds/led-triggers.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index f0b3d101994b..59d6a3e58a3d 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c | |||
@@ -81,21 +81,23 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr, | |||
81 | down_read(&led_cdev->trigger_lock); | 81 | down_read(&led_cdev->trigger_lock); |
82 | 82 | ||
83 | if (!led_cdev->trigger) | 83 | if (!led_cdev->trigger) |
84 | len += sprintf(buf+len, "[none] "); | 84 | len += scnprintf(buf+len, PAGE_SIZE - len, "[none] "); |
85 | else | 85 | else |
86 | len += sprintf(buf+len, "none "); | 86 | len += scnprintf(buf+len, PAGE_SIZE - len, "none "); |
87 | 87 | ||
88 | list_for_each_entry(trig, &trigger_list, next_trig) { | 88 | list_for_each_entry(trig, &trigger_list, next_trig) { |
89 | if (led_cdev->trigger && !strcmp(led_cdev->trigger->name, | 89 | if (led_cdev->trigger && !strcmp(led_cdev->trigger->name, |
90 | trig->name)) | 90 | trig->name)) |
91 | len += sprintf(buf+len, "[%s] ", trig->name); | 91 | len += scnprintf(buf+len, PAGE_SIZE - len, "[%s] ", |
92 | trig->name); | ||
92 | else | 93 | else |
93 | len += sprintf(buf+len, "%s ", trig->name); | 94 | len += scnprintf(buf+len, PAGE_SIZE - len, "%s ", |
95 | trig->name); | ||
94 | } | 96 | } |
95 | up_read(&led_cdev->trigger_lock); | 97 | up_read(&led_cdev->trigger_lock); |
96 | up_read(&triggers_list_lock); | 98 | up_read(&triggers_list_lock); |
97 | 99 | ||
98 | len += sprintf(len+buf, "\n"); | 100 | len += scnprintf(len+buf, PAGE_SIZE - len, "\n"); |
99 | return len; | 101 | return len; |
100 | } | 102 | } |
101 | EXPORT_SYMBOL_GPL(led_trigger_show); | 103 | EXPORT_SYMBOL_GPL(led_trigger_show); |