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

Commit cf48a7ba authored by Nikita Zhandarovich's avatar Nikita Zhandarovich Committed by Greg Kroah-Hartman
Browse files

HID: logitech-dj: Fix error handling in logi_dj_recv_switch_to_dj_mode() 



[ Upstream commit 6f20d3261265885f6a6be4cda49d7019728760e0 ]

Presently, if a call to logi_dj_recv_send_report() fails, we do
not learn about the error until after sending short
HID_OUTPUT_REPORT with hid_hw_raw_request().
To handle this somewhat unlikely issue, return on error in
logi_dj_recv_send_report() (minding ugly sleep workaround) and
take into account the result of hid_hw_raw_request().

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

Fixes: 6a9ddc89 ("HID: logitech-dj: enable notifications on connect/disconnect")
Signed-off-by: default avatarNikita Zhandarovich <n.zhandarovich@fintech.ru>
Link: https://lore.kernel.org/r/20230613101635.77820-1-n.zhandarovich@fintech.ru


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 011daffb

drivers/hid/hid-logitech-dj.c

+4 −1
Original line number Diff line number Diff line
@@ -1212,6 +1212,9 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev, 
		 * 50 msec should gives enough time to the receiver to be ready.

		 */

		msleep(50);



		if (retval)

			return retval;

	}



	/*
@@ -1233,7 +1236,7 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev, 
	buf[5] = 0x09;

	buf[6] = 0x00;



	hid_hw_raw_request(hdev, REPORT_ID_HIDPP_SHORT, buf,

	retval = hid_hw_raw_request(hdev, REPORT_ID_HIDPP_SHORT, buf,

			HIDPP_REPORT_SHORT_LENGTH, HID_OUTPUT_REPORT,

			HID_REQ_SET_REPORT);