[PATCH 3/5] HID: alps: pass correct sizes to hid_hw_raw_request()

Ying-Chun Liu (PaulLiu) paul.liu at canonical.com
Fri Aug 26 09:19:36 UTC 2016


From: Jiri Kosina <jkosina at suse.cz>

Calculating size of the report as sizeof(pointer) always passess the length
corresponding to the pointer type, not the underlying data report.

BugLink: https://bugs.launchpad.net/bugs/1616813

Reported-by: kbuild test robot <fengguang.wu at intel.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
(cherry picked from commit 63b3a7d0f933ebf25961e602c2eb11d658fef912)
Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu at canonical.com>
---
 drivers/hid/hid-alps.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index 098bce6..ff64c929 100644
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@ -136,7 +136,8 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
 
 	input[7] = check_sum;
 	ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, input,
-			sizeof(input), HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+			sizeof(u8)*U1_FEATURE_REPORT_LEN, HID_FEATURE_REPORT,
+			HID_REQ_SET_REPORT);
 
 	if (ret < 0) {
 		dev_err(&hdev->dev, "failed to read command (%d)\n", ret);
@@ -145,8 +146,8 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
 
 	if (read_flag) {
 		ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, readbuf,
-				sizeof(readbuf), HID_FEATURE_REPORT,
-				HID_REQ_GET_REPORT);
+				sizeof(u8)*U1_FEATURE_REPORT_LEN,
+				HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
 
 		if (ret < 0) {
 			dev_err(&hdev->dev, "failed read register (%d)\n", ret);
-- 
2.9.3





More information about the kernel-team mailing list