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

Commit 46541f21 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_frame_init_v1_buttonpad 



[ Upstream commit aa320fdbbbb482c19100f51461bd0069753ce3d7 ]

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: 1443763 ("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 f6fbc6a0

drivers/hid/hid-uclogic-params.c

+3 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int uclogic_params_frame_init_v1_buttonpad( 
{

	int rc;

	bool found = false;

	struct usb_device *usb_dev = hid_to_usb_dev(hdev);

	struct usb_device *usb_dev;

	char *str_buf = NULL;

	const size_t str_len = 16;
@@ -461,6 +461,8 @@ static int uclogic_params_frame_init_v1_buttonpad( 
		goto cleanup;

	}



	usb_dev = hid_to_usb_dev(hdev);



	/*

	 * Enable generic button mode

	 */