Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f660b3f authored by José Expósito's avatar José Expósito Committed by Greg Kroah-Hartman
Browse files

HID: hid-uclogic-params: Invalid parameter check in uclogic_params_get_str_desc 



[ Upstream commit 0a94131d6920916ccb6a357037c535533af08819 ]

The function performs a check on the hdev input parameters, however, it
is used before the check.

Initialize the udev variable after the sanity check to avoid a
possible NULL pointer dereference.

Fixes: 9614219e ("HID: uclogic: Extract tablet parameter discovery into a module")
Addresses-Coverity-ID: 1443827 ("Null pointer dereference")
Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3f4823c6

drivers/hid/hid-uclogic-params.c

+3 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int uclogic_params_get_str_desc(__u8 **pbuf, struct hid_device *hdev, 
					__u8 idx, size_t len)

{

	int rc;

	struct usb_device *udev = hid_to_usb_dev(hdev);

	struct usb_device *udev;

	__u8 *buf = NULL;



	/* Check arguments */
@@ -74,6 +74,8 @@ static int uclogic_params_get_str_desc(__u8 **pbuf, struct hid_device *hdev, 
		goto cleanup;

	}



	udev = hid_to_usb_dev(hdev);



	buf = kmalloc(len, GFP_KERNEL);

	if (buf == NULL) {

		rc = -ENOMEM;