diff options
| author | José Expósito <jose.exposito89@gmail.com> | 2022-01-05 18:29:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-27 09:19:36 +0100 |
| commit | f6fbc6a0502c5b36c05913c8b5afc9b3c022a72f (patch) | |
| tree | 3a12e3ba2a9bb71726105ba0e569c8d9a55b90cf /drivers/hid | |
| parent | 1f660b3ff5d67c1690afe49f70ccf4abff58fd0a (diff) | |
| download | linux-f6fbc6a0502c5b36c05913c8b5afc9b3c022a72f.tar.gz linux-f6fbc6a0502c5b36c05913c8b5afc9b3c022a72f.tar.bz2 linux-f6fbc6a0502c5b36c05913c8b5afc9b3c022a72f.zip | |
HID: hid-uclogic-params: Invalid parameter check in uclogic_params_huion_init
[ Upstream commit ff6b548afe4d9d1ff3a0f6ef79e8cbca25d8f905 ]
The function performs a check on its input parameters, however, the
hdev parameter is used before the check.
Initialize the stack variables after checking the input parameters to
avoid a possible NULL pointer dereference.
Fixes: 9614219e9310e ("HID: uclogic: Extract tablet parameter discovery into a module")
Addresses-Coverity-ID: 1443804 ("Null pointer dereference")
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-uclogic-params.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c index 1f3ea6c93ef4..0fdac91c5f51 100644 --- a/drivers/hid/hid-uclogic-params.c +++ b/drivers/hid/hid-uclogic-params.c @@ -707,9 +707,9 @@ static int uclogic_params_huion_init(struct uclogic_params *params, struct hid_device *hdev) { int rc; - struct usb_device *udev = hid_to_usb_dev(hdev); - struct usb_interface *iface = to_usb_interface(hdev->dev.parent); - __u8 bInterfaceNumber = iface->cur_altsetting->desc.bInterfaceNumber; + struct usb_device *udev; + struct usb_interface *iface; + __u8 bInterfaceNumber; bool found; /* The resulting parameters (noop) */ struct uclogic_params p = {0, }; @@ -723,6 +723,10 @@ static int uclogic_params_huion_init(struct uclogic_params *params, goto cleanup; } + udev = hid_to_usb_dev(hdev); + iface = to_usb_interface(hdev->dev.parent); + bInterfaceNumber = iface->cur_altsetting->desc.bInterfaceNumber; + /* If it's not a pen interface */ if (bInterfaceNumber != 0) { /* TODO: Consider marking the interface invalid */ |