* [PATCH] leds: do not overflow sysfs buffer in led_trigger_show
@ 2016-08-15 22:20 Zach Brown
2016-08-16 20:39 ` Jacek Anaszewski
0 siblings, 1 reply; 2+ messages in thread
From: Zach Brown @ 2016-08-15 22:20 UTC (permalink / raw)
To: rpurdie, j.anaszewski
Cc: linux-leds, linux-kernel, nathan.sullivan, Zach Brown
From: Nathan Sullivan <nathan.sullivan@ni.com>
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>
---
drivers/leds/led-triggers.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index c92702a..8668538 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,
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);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] leds: do not overflow sysfs buffer in led_trigger_show
2016-08-15 22:20 [PATCH] leds: do not overflow sysfs buffer in led_trigger_show Zach Brown
@ 2016-08-16 20:39 ` Jacek Anaszewski
0 siblings, 0 replies; 2+ messages in thread
From: Jacek Anaszewski @ 2016-08-16 20:39 UTC (permalink / raw)
To: Zach Brown, rpurdie, j.anaszewski
Cc: linux-leds, linux-kernel, nathan.sullivan
Hi Zach,
On 08/16/2016 12:20 AM, Zach Brown wrote:
> From: Nathan Sullivan <nathan.sullivan@ni.com>
>
> 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>
> ---
> drivers/leds/led-triggers.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
> index c92702a..8668538 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,
> 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);
>
Thanks for the patch, applied.
--
Best regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-16 20:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-15 22:20 [PATCH] leds: do not overflow sysfs buffer in led_trigger_show Zach Brown
2016-08-16 20:39 ` Jacek Anaszewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).