2023-04-27 12:07:30

by Denis Arefev

Subject: [PATCH] HID: wacom: Added error check

Added a variable check and
transition in case of an error

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Denis Arefev <[email protected]>
---
drivers/hid/wacom_sys.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index fb538a6c4add..aff4a21a46b6 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2417,8 +2417,13 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
goto fail_quirks;
}

- if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR)
+ if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR) {
error = hid_hw_open(hdev);
+ if (error) {
+ hid_err(hdev, "hw open failed\n");
+ goto fail_quirks;
+ }
+ }

wacom_set_shared_values(wacom_wac);
devres_close_group(&hdev->dev, wacom);
--
2.25.1

2023-04-27 18:01:00

by Ping Cheng

Subject: Re: [PATCH] HID: wacom: Added error check

On Thu, Apr 27, 2023 at 5:07 AM Denis Arefev <[email protected]> wrote:
>
> Added a variable check and
> transition in case of an error
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Signed-off-by: Denis Arefev <[email protected]>

Thank you Denis for working on the patch! The patch LGTM.

Reviewed-by: Ping Cheng <[email protected]>

Cheers,
Ping

> ---
> drivers/hid/wacom_sys.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> index fb538a6c4add..aff4a21a46b6 100644
> --- a/drivers/hid/wacom_sys.c
> +++ b/drivers/hid/wacom_sys.c
> @@ -2417,8 +2417,13 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
> goto fail_quirks;
> }
>
> - if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR)
> + if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR) {
> error = hid_hw_open(hdev);
> + if (error) {
> + hid_err(hdev, "hw open failed\n");
> + goto fail_quirks;
> + }
> + }
>
> wacom_set_shared_values(wacom_wac);
> devres_close_group(&hdev->dev, wacom);
> --
> 2.25.1
>

2023-05-23 13:13:29

by Jiri Kosina

Subject: Re: [PATCH] HID: wacom: Added error check

On Thu, 27 Apr 2023, Denis Arefev wrote:

> Added a variable check and
> transition in case of an error
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.

Applied, thanks.

--
Jiri Kosina
SUSE Labs