From: Christophe JAILLET Date: Mon, 19 Mar 2018 20:53:26 +0000 (+0100) Subject: HID: alps: Report an error if we receive invalid data in 't4_read_write_register()' X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=605f077290a594c75a952ad3b78e53d68c1895ae;p=openwrt%2Fstaging%2Fblogic.git HID: alps: Report an error if we receive invalid data in 't4_read_write_register()' If the data received is not what is expected, we should return an error. Otherwise, we return 0 or a positive value which will be interpreted as success, but '*read_val' has not been updated. Fixes: 73196ebe134d ("HID: alps: add support for Alps T4 Touchpad device") Signed-off-by: Christophe JAILLET Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index b1eeb4839bfc..925396fdf0d9 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -219,6 +219,8 @@ static int t4_read_write_register(struct hid_device *hdev, u32 address, goto exit_readbuf; } + ret = -EINVAL; + if (*(u32 *)&readbuf[6] != address) { dev_err(&hdev->dev, "read register address error (%x,%x)\n", *(u32 *)&readbuf[6], address);