[PATCH] leds/led-class: Add missing put_device()

[PATCH] leds/led-class: Add missing put_device()

[Ricardo Ribalda Delgado]

Devices found by class_find_device must be freed with put_device().
Otherwise the reference count will not work properly.

Fixes: a96aa64cb572 ("leds/led-class: Handle LEDs with the same name")
Reported-by: Alan Tull <delicious.quinoa@gmail.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---

Thanks Alan!

 drivers/leds/led-class.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index beabfbc6f7cd..380cda0bff72 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -228,12 +228,15 @@ static int led_classdev_next_name(const char *init_name, char *name,
 {
 	unsigned int i = 0;
 	int ret = 0;
+	struct device *dev;
 
 	strlcpy(name, init_name, len);
 
-	while (class_find_device(leds_class, NULL, name, match_name) &&
-	       (ret < len))
+	while ((dev = class_find_device(leds_class, NULL, name, match_name)) &&
+	       (ret < len)) {
+		put_device(dev);
 		ret = snprintf(name, len, "%s_%u", init_name, ++i);
+	}
 
 	if (ret >= len)
 		return -ENOMEM;
-- 
2.1.4

Re: [PATCH] leds/led-class: Add missing put_device()

[Jacek Anaszewski]

Hi Ricardo,

On 24.07.2015 16:09, Ricardo Ribalda Delgado wrote:
> Devices found by class_find_device must be freed with put_device().
> Otherwise the reference count will not work properly.
>
> Fixes: a96aa64cb572 ("leds/led-class: Handle LEDs with the same name")
> Reported-by: Alan Tull <delicious.quinoa@gmail.com>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>
> Thanks Alan!
>
>   drivers/leds/led-class.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
> index beabfbc6f7cd..380cda0bff72 100644
> --- a/drivers/leds/led-class.c
> +++ b/drivers/leds/led-class.c
> @@ -228,12 +228,15 @@ static int led_classdev_next_name(const char *init_name, char *name,
>   {
>   	unsigned int i = 0;
>   	int ret = 0;
> +	struct device *dev;
>
>   	strlcpy(name, init_name, len);
>
> -	while (class_find_device(leds_class, NULL, name, match_name) &&
> -	       (ret < len))
> +	while ((dev = class_find_device(leds_class, NULL, name, match_name)) &&
> +	       (ret < len)) {
> +		put_device(dev);

IIUC, we will be leaking dev if ret >= len.

>   		ret = snprintf(name, len, "%s_%u", init_name, ++i);
> +	}
>
>   	if (ret >= len)
>   		return -ENOMEM;
>

-- 
Best Regards,
Jacek Anaszewski