2022-02-25 05:52:41

by Jia-Ju Bai

Subject: [PATCH] hid: hid-nintendo: check the return value of alloc_workqueue()

The function alloc_workqueue() in nintendo_hid_probe() can fail, but
there is no check of its return value. To fix this bug, its return value
should be checked with new error handling code.

Fixes: c4eae84feff3e ("HID: nintendo: add rumble support")
Reported-by: TOTE Robot <[email protected]>
Signed-off-by: Jia-Ju Bai <[email protected]>
---
drivers/hid/hid-nintendo.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index b6a9a0f3966e..2204de889739 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -2128,6 +2128,10 @@ static int nintendo_hid_probe(struct hid_device *hdev,
spin_lock_init(&ctlr->lock);
ctlr->rumble_queue = alloc_workqueue("hid-nintendo-rumble_wq",
WQ_FREEZABLE | WQ_MEM_RECLAIM, 0);
+ if (!ctlr->rumble_queue) {
+ ret = -ENOMEM;
+ goto err;
+ }
INIT_WORK(&ctlr->rumble_worker, joycon_rumble_worker);

ret = hid_parse(hdev);
--
2.17.1

2022-02-26 17:50:07

by Silvan Jegen

Subject: Re: [PATCH] hid: hid-nintendo: check the return value of alloc_workqueue()

Hi

Jia-Ju Bai <[email protected]> wrote:
> The function alloc_workqueue() in nintendo_hid_probe() can fail, but
> there is no check of its return value. To fix this bug, its return value
> should be checked with new error handling code.
>
> Fixes: c4eae84feff3e ("HID: nintendo: add rumble support")
> Reported-by: TOTE Robot <[email protected]>
> Signed-off-by: Jia-Ju Bai <[email protected]>
> ---
> drivers/hid/hid-nintendo.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
> index b6a9a0f3966e..2204de889739 100644
> --- a/drivers/hid/hid-nintendo.c
> +++ b/drivers/hid/hid-nintendo.c
> @@ -2128,6 +2128,10 @@ static int nintendo_hid_probe(struct hid_device *hdev,
> spin_lock_init(&ctlr->lock);
> ctlr->rumble_queue = alloc_workqueue("hid-nintendo-rumble_wq",
> WQ_FREEZABLE | WQ_MEM_RECLAIM, 0);
> + if (!ctlr->rumble_queue) {
> + ret = -ENOMEM;
> + goto err;
> + }
> INIT_WORK(&ctlr->rumble_worker, joycon_rumble_worker);
>
> ret = hid_parse(hdev);

LGTM!

Reviewed-by: Silvan Jegen <[email protected]>


Cheers,

Silvan

2022-03-02 03:09:26

by Jiri Kosina

Subject: Re: [PATCH] hid: hid-nintendo: check the return value of alloc_workqueue()

On Thu, 24 Feb 2022, Jia-Ju Bai wrote:

> The function alloc_workqueue() in nintendo_hid_probe() can fail, but
> there is no check of its return value. To fix this bug, its return value
> should be checked with new error handling code.
>
> Fixes: c4eae84feff3e ("HID: nintendo: add rumble support")
> Reported-by: TOTE Robot <[email protected]>
> Signed-off-by: Jia-Ju Bai <[email protected]>
> ---
> drivers/hid/hid-nintendo.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
> index b6a9a0f3966e..2204de889739 100644
> --- a/drivers/hid/hid-nintendo.c
> +++ b/drivers/hid/hid-nintendo.c
> @@ -2128,6 +2128,10 @@ static int nintendo_hid_probe(struct hid_device *hdev,
> spin_lock_init(&ctlr->lock);
> ctlr->rumble_queue = alloc_workqueue("hid-nintendo-rumble_wq",
> WQ_FREEZABLE | WQ_MEM_RECLAIM, 0);
> + if (!ctlr->rumble_queue) {
> + ret = -ENOMEM;
> + goto err;
> + }
> INIT_WORK(&ctlr->rumble_worker, joycon_rumble_worker);

Thanks for the patch.

For future submissions, please try to make sure to always follow the
subsystem-specific formatting of the shortlog (upperacase "HID: " prefix
in this case).

I've fixed that up and applied.

--
Jiri Kosina
SUSE Labs