2017-07-07 05:12:23

by Gustavo A. R. Silva

Subject: [PATCH] HID: hid-logitech-hidpp: add NULL check on devm_kmemdup() return value

Check return value from call to devm_kmemdup()
in order to prevent a NULL pointer dereference.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/hid/hid-logitech-hidpp.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 41b3946..501e16a 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -2732,6 +2732,9 @@ static int hidpp_initialize_battery(struct hidpp_device *hidpp)
hidpp_battery_props,
sizeof(hidpp_battery_props),
GFP_KERNEL);
+ if (!battery_props)
+ return -ENOMEM;
+
num_battery_props = ARRAY_SIZE(hidpp_battery_props) - 2;

if (hidpp->capabilities & HIDPP_CAPABILITY_BATTERY_MILEAGE)
--
2.5.0

2017-07-12 07:40:42

by Benjamin Tissoires

Subject: Re: [PATCH] HID: hid-logitech-hidpp: add NULL check on devm_kmemdup() return value

On Jul 07 2017 or thereabouts, Gustavo A. R. Silva wrote:
> Check return value from call to devm_kmemdup()
> in order to prevent a NULL pointer dereference.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---

Reviewed-by: Benjamin Tissoires <[email protected]>

> drivers/hid/hid-logitech-hidpp.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
> index 41b3946..501e16a 100644
> --- a/drivers/hid/hid-logitech-hidpp.c
> +++ b/drivers/hid/hid-logitech-hidpp.c
> @@ -2732,6 +2732,9 @@ static int hidpp_initialize_battery(struct hidpp_device *hidpp)
> hidpp_battery_props,
> sizeof(hidpp_battery_props),
> GFP_KERNEL);
> + if (!battery_props)
> + return -ENOMEM;
> +
> num_battery_props = ARRAY_SIZE(hidpp_battery_props) - 2;
>
> if (hidpp->capabilities & HIDPP_CAPABILITY_BATTERY_MILEAGE)
> --
> 2.5.0
>

2017-07-17 05:00:56

by Gustavo A. R. Silva

Subject: Re: [PATCH] HID: hid-logitech-hidpp: add NULL check on devm_kmemdup() return value

On 07/12/2017 02:40 AM, Benjamin Tissoires wrote:
> On Jul 07 2017 or thereabouts, Gustavo A. R. Silva wrote:
>> Check return value from call to devm_kmemdup()
>> in order to prevent a NULL pointer dereference.
>>
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>> ---
>
> Reviewed-by: Benjamin Tissoires <[email protected]>
>

Thank you, Benjamin.

>> drivers/hid/hid-logitech-hidpp.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
>> index 41b3946..501e16a 100644
>> --- a/drivers/hid/hid-logitech-hidpp.c
>> +++ b/drivers/hid/hid-logitech-hidpp.c
>> @@ -2732,6 +2732,9 @@ static int hidpp_initialize_battery(struct hidpp_device *hidpp)
>> hidpp_battery_props,
>> sizeof(hidpp_battery_props),
>> GFP_KERNEL);
>> + if (!battery_props)
>> + return -ENOMEM;
>> +
>> num_battery_props = ARRAY_SIZE(hidpp_battery_props) - 2;
>>
>> if (hidpp->capabilities & HIDPP_CAPABILITY_BATTERY_MILEAGE)
>> --
>> 2.5.0
>>

--
Gustavo A. R. Silva

2017-07-20 13:46:22

by Jiri Kosina

Subject: Re: [PATCH] HID: hid-logitech-hidpp: add NULL check on devm_kmemdup() return value

On Fri, 7 Jul 2017, Gustavo A. R. Silva wrote:

> Check return value from call to devm_kmemdup()
> in order to prevent a NULL pointer dereference.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> drivers/hid/hid-logitech-hidpp.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
> index 41b3946..501e16a 100644
> --- a/drivers/hid/hid-logitech-hidpp.c
> +++ b/drivers/hid/hid-logitech-hidpp.c
> @@ -2732,6 +2732,9 @@ static int hidpp_initialize_battery(struct hidpp_device *hidpp)
> hidpp_battery_props,
> sizeof(hidpp_battery_props),
> GFP_KERNEL);
> + if (!battery_props)
> + return -ENOMEM;
> +

Applied to for-4.13/upstream-fixes, thanks.

--
Jiri Kosina
SUSE Labs