[PATCH] HID: nvidia-shield: Add some null pointer checks to the hid-nvidia-shield.c

[PATCH] HID: nvidia-shield: Add some null pointer checks to the hid-nvidia-shield.c

[Kunwu Chan]

devm_kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure. Ensure the allocation was successful
by checking the pointer validity.

Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
---
 drivers/hid/hid-nvidia-shield.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/hid/hid-nvidia-shield.c b/drivers/hid/hid-nvidia-shield.c
index 82d0a77359c4..58b15750dbb0 100644
--- a/drivers/hid/hid-nvidia-shield.c
+++ b/drivers/hid/hid-nvidia-shield.c
@@ -800,6 +800,8 @@ static inline int thunderstrike_led_create(struct thunderstrike *ts)
 
 	led->name = devm_kasprintf(&ts->base.hdev->dev, GFP_KERNEL,
 				   "thunderstrike%d:blue:led", ts->id);
+	if (!led->name)
+		return -ENOMEM;
 	led->max_brightness = 1;
 	led->flags = LED_CORE_SUSPENDRESUME | LED_RETAIN_AT_SHUTDOWN;
 	led->brightness_get = &thunderstrike_led_get_brightness;
@@ -831,6 +833,8 @@ static inline int thunderstrike_psy_create(struct shield_device *shield_dev)
 	shield_dev->battery_dev.desc.name =
 		devm_kasprintf(&ts->base.hdev->dev, GFP_KERNEL,
 			       "thunderstrike_%d", ts->id);
+	if (!shield_dev->battery_dev.desc.name)
+		return -ENOMEM;
 
 	shield_dev->battery_dev.psy = power_supply_register(
 		&hdev->dev, &shield_dev->battery_dev.desc, &psy_cfg);
-- 
2.39.2

Re: [PATCH] HID: nvidia-shield: Add some null pointer checks to the hid-nvidia-shield.c

[Rahul Rameshbabu]

On Fri, 19 Jan, 2024 14:07:14 +0800 Kunwu Chan <chentao@kylinos.cn> wrote:
> devm_kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure. Ensure the allocation was successful
> by checking the pointer validity.
>
> Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
> ---

Just one comment about the subject for future submissions (this one is
fine). I would just leave the subject as "HID: nvidia-shield: Add some
null pointer checks". We know what file is being edited from the commit
content, so the additional filename detail isn't necessary.

Thanks for the patch. Really appreciate it.

Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>

Re: [PATCH] HID: nvidia-shield: Add some null pointer checks to the hid-nvidia-shield.c

[Jiri Kosina]

On Thu, 18 Jan 2024, Rahul Rameshbabu wrote:

> > devm_kasprintf() returns a pointer to dynamically allocated memory
> > which can be NULL upon failure. Ensure the allocation was successful
> > by checking the pointer validity.
> >
> > Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
> > ---
> 
> Just one comment about the subject for future submissions (this one is
> fine). I would just leave the subject as "HID: nvidia-shield: Add some
> null pointer checks". We know what file is being edited from the commit
> content, so the additional filename detail isn't necessary.
> 
> Thanks for the patch. Really appreciate it.
> 
> Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>

I have tweaked the changelog a little bit and applied, thanks.

-- 
Jiri Kosina
SUSE Labs