leds: trigger: gpio: Convert to use kstrtox()
PATCH 1/1 leds: trigger: gpio: Convert to use kstrtox()
sscanf() is a heavy one and moreover requires additional boundary checks. Convert driver to use kstrtox() and replace kstrtoul() by kstrtobool() in gpio_trig_inverted_store().
While here, check the desired brightness against maximum defined for a certain LED.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/leds/trigger/ledtrig-gpio.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/leds/trigger/ledtrig-gpio.c +9 -12
@@ -60,10 +60,10 @@ static ssize_t gpio_trig_brightness_store(struct device *dev,unsigned desired_brightness;int ret; - ret =sscanf (buf,"%u" , &desired_brightness); -if (ret <1 || desired_brightness >255 ) { + ret =kstrtouint (buf,10 , &desired_brightness); +if (ret || desired_brightness > gpio_data->led->max_brightness) {dev_err (dev,"invalid value\n" ); -return -EINVAL ; +return ret ?: -EINVAL ; } gpio_data->desired_brightness = desired_brightness;
@@ -86,16 +86,13 @@ static ssize_t gpio_trig_inverted_store(struct device *dev, {struct led_classdev *led =led_trigger_get_led (dev);struct gpio_trig_data *gpio_data =led_trigger_get_drvdata (dev); -unsigned long inverted; +bool inverted;int ret; - ret =kstrtoul (buf,10 , &inverted); -if (ret <0 ) + ret =kstrtobool (buf, &inverted); +if (ret)return ret; -if (inverted >1 ) -return -EINVAL ; - gpio_data->inverted = inverted;/* After inverting, we need to update the LED. */
@@ -123,10 +120,10 @@ static ssize_t gpio_trig_gpio_store(struct device *dev,unsigned gpio;int ret; - ret =sscanf (buf,"%u" , &gpio); -if (ret <1 ) { + ret =kstrtouint (buf,10 , &gpio); +if (ret) {dev_err (dev,"couldn't read gpio number\n" ); -return -EINVAL ; +return ret; }if (gpio_data->gpio == gpio)
Signature · 1 line
2.35.1
Quoted 6 lines · Andy Shevchenko
sscanf()is a heavy one and moreover requires additional boundary checks. Convert driver to usekstrtox()and replacekstrtoul()bykstrtobool()ingpio_trig_inverted_store().While here, check the desired brightness against maximum defined for a certain LED.
I realize that this part may be wrong. I have to drop it in the next version.
Signature · 2 lines
With Best Regards, Andy Shevchenko