* [PATCH] platform: x86: Add check for led_classdev_register
@ 2018-12-24 22:07 Aditya Pakki
2019-02-05 16:21 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Aditya Pakki @ 2018-12-24 22:07 UTC (permalink / raw)
To: pakki001
Cc: kjlu, Darren Hart, Andy Shevchenko, platform-driver-x86, linux-kernel
In function alienware_zone_init, the function led_classdev_register
can return an error on failure. The fix checks the error and frees
the allocated resources.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
drivers/platform/x86/alienware-wmi.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
index f10af5c383c5..63ab6a2eb613 100644
--- a/drivers/platform/x86/alienware-wmi.c
+++ b/drivers/platform/x86/alienware-wmi.c
@@ -441,6 +441,7 @@ static int alienware_zone_init(struct platform_device *dev)
u8 zone;
char buffer[10];
char *name;
+ int ret;
if (interface == WMAX) {
lighting_control_state = WMAX_RUNNING;
@@ -492,7 +493,17 @@ static int alienware_zone_init(struct platform_device *dev)
zone_attrs[quirks->num_zones] = &dev_attr_lighting_control_state.attr;
zone_attribute_group.attrs = zone_attrs;
- led_classdev_register(&dev->dev, &global_led);
+ ret = led_classdev_register(&dev->dev, &global_led);
+ if (ret < 0) {
+ if (zone_dev_attrs) {
+ for (zone = 0; zone < quirks->num_zones; zone++)
+ kfree(zone_dev_attrs[zone].attr.name);
+ }
+ kfree(zone_dev_attrs);
+ kfree(zone_data);
+ kfree(zone_attrs);
+ return ret;
+ }
return sysfs_create_group(&dev->dev.kobj, &zone_attribute_group);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] platform: x86: Add check for led_classdev_register
2018-12-24 22:07 [PATCH] platform: x86: Add check for led_classdev_register Aditya Pakki
@ 2019-02-05 16:21 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2019-02-05 16:21 UTC (permalink / raw)
To: Aditya Pakki
Cc: kjlu, Darren Hart, Andy Shevchenko, Platform Driver,
Linux Kernel Mailing List
On Tue, Dec 25, 2018 at 12:08 AM Aditya Pakki <pakki001@umn.edu> wrote:
>
> In function alienware_zone_init, the function led_classdev_register
> can return an error on failure. The fix checks the error and frees
> the allocated resources.
>
I'm not sure about this.
Is the LED registration fatal?
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
> drivers/platform/x86/alienware-wmi.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
> index f10af5c383c5..63ab6a2eb613 100644
> --- a/drivers/platform/x86/alienware-wmi.c
> +++ b/drivers/platform/x86/alienware-wmi.c
> @@ -441,6 +441,7 @@ static int alienware_zone_init(struct platform_device *dev)
> u8 zone;
> char buffer[10];
> char *name;
> + int ret;
>
> if (interface == WMAX) {
> lighting_control_state = WMAX_RUNNING;
> @@ -492,7 +493,17 @@ static int alienware_zone_init(struct platform_device *dev)
> zone_attrs[quirks->num_zones] = &dev_attr_lighting_control_state.attr;
> zone_attribute_group.attrs = zone_attrs;
>
> - led_classdev_register(&dev->dev, &global_led);
> + ret = led_classdev_register(&dev->dev, &global_led);
> + if (ret < 0) {
> + if (zone_dev_attrs) {
> + for (zone = 0; zone < quirks->num_zones; zone++)
> + kfree(zone_dev_attrs[zone].attr.name);
> + }
> + kfree(zone_dev_attrs);
> + kfree(zone_data);
> + kfree(zone_attrs);
> + return ret;
> + }
>
> return sysfs_create_group(&dev->dev.kobj, &zone_attribute_group);
> }
> --
> 2.17.1
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-05 16:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-24 22:07 [PATCH] platform: x86: Add check for led_classdev_register Aditya Pakki
2019-02-05 16:21 ` Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.