2010-07-06 02:30:22

by Axel Lin

Subject: [PATCH] hp-wmi: add return value checking for input_allocate_device()

Add error checking and return -ENOMEM if input_allocate_device() fail.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/platform/x86/hp-wmi.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 51c07a0..c508e20 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -402,6 +402,8 @@ static int __init hp_wmi_input_setup(void)
int err;

hp_wmi_input_dev = input_allocate_device();
+ if (!hp_wmi_input_dev)
+ return -ENOMEM;

hp_wmi_input_dev->name = "HP WMI hotkeys";
hp_wmi_input_dev->phys = "wmi/input0";
--
1.5.4.3

2010-07-06 07:56:50

by Thomas Renninger

Subject: Re: [PATCH] hp-wmi: add return value checking for input_allocate_device()

Hi,

it's incredible how much cleanups and fixes you find in this
handful of drivers... It's very much appreciated!

On Tuesday 06 July 2010 04:30:26 Axel Lin wrote:
> Add error checking and return -ENOMEM if input_allocate_device() fail.
>
> Signed-off-by: Axel Lin <[email protected]>
> ---
> drivers/platform/x86/hp-wmi.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
> index 51c07a0..c508e20 100644
> --- a/drivers/platform/x86/hp-wmi.c
> +++ b/drivers/platform/x86/hp-wmi.c
> @@ -402,6 +402,8 @@ static int __init hp_wmi_input_setup(void)
> int err;
>
> hp_wmi_input_dev = input_allocate_device();
> + if (!hp_wmi_input_dev)
> + return -ENOMEM;
>
> hp_wmi_input_dev->name = "HP WMI hotkeys";
> hp_wmi_input_dev->phys = "wmi/input0";
But also hp_wmi_input_setup() call should get checked and if it
fails, the previous wmi_install_notify_handler() must get uninstalled
again. Hm, probably the whole driver shouldn't load then and
the error code from hp_wmi_input_setup() can be returned in
hp_wmi_init(void).

Do you mind to incorporate above if you agree.

Thanks,

Thomas

2010-07-06 08:08:12

by Axel Lin

Subject: Re: [PATCH] hp-wmi: add return value checking for input_allocate_device()

hi Thomas,
2010/7/6 Thomas Renninger <[email protected]>:
> Hi,
>
> it's incredible how much cleanups and fixes you find in this
> handful of drivers... It's very much appreciated!
>
> On Tuesday 06 July 2010 04:30:26 Axel Lin wrote:
>> Add error checking and return -ENOMEM if input_allocate_device() fail.
>>
>> Signed-off-by: Axel Lin <[email protected]>
>> ---
>> ?drivers/platform/x86/hp-wmi.c | ? ?2 ++
>> ?1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
>> index 51c07a0..c508e20 100644
>> --- a/drivers/platform/x86/hp-wmi.c
>> +++ b/drivers/platform/x86/hp-wmi.c
>> @@ -402,6 +402,8 @@ static int __init hp_wmi_input_setup(void)
>> ? ? ? int err;
>>
>> ? ? ? hp_wmi_input_dev = input_allocate_device();
>> + ? ? if (!hp_wmi_input_dev)
>> + ? ? ? ? ? ? return -ENOMEM;
>>
>> ? ? ? hp_wmi_input_dev->name = "HP WMI hotkeys";
>> ? ? ? hp_wmi_input_dev->phys = "wmi/input0";
> But also hp_wmi_input_setup() call should get checked and if it
> fails, the previous wmi_install_notify_handler() must get uninstalled
> again. Hm, probably the whole driver shouldn't load then and
> the error code from hp_wmi_input_setup() can be returned in
> hp_wmi_init(void).
>
> Do you mind to incorporate above if you agree.

Checking hp_wmi_input_setup() is already done in my previous patch.
( which is already merged in platform-driver-x86 tree.
http://git.kernel.org/?p=linux/kernel/git/mjg59/platform-drivers-x86.git;a=commitdiff;h=b035d5f9fcb6cd6bba44b764b17d885f4d960d37
).
Thus this patch only adds the return value checking for
input_allocate_device() in hp_wmi_input_setup().

Regards,
Axel


>
> Thanks,
>
> ? Thomas
>

2010-07-06 08:11:19

by Thomas Renninger

Subject: Re: [PATCH] hp-wmi: add return value checking for input_allocate_device()

On Tuesday 06 July 2010 10:07:49 Axel Lin wrote:
> hi Thomas,
> 2010/7/6 Thomas Renninger <[email protected]>:
...
> > Do you mind to incorporate above if you agree.
>
> Checking hp_wmi_input_setup() is already done in my previous patch.
> ( which is already merged in platform-driver-x86 tree.
...
Perfect!
Acked-by: Thomas Renninger <[email protected]>

Thomas