HID: core: check parameters when sending/receiving data from the device

It is better to check them soon enough before triggering any kernel panic.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index 5308656eec2e625f78c4e2d058087813bdc28406..1a955317d05fd058ef4feb7dc89c29ec2859e806 100644 (file)
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -276,7 +276,7 @@ static int i2c_hid_set_or_send_report(struct i2c_client *client, u8 reportType,
        u16 outputRegister = le16_to_cpu(ihid->hdesc.wOutputRegister);
        u16 maxOutputLength = le16_to_cpu(ihid->hdesc.wMaxOutputLength);
 
-       /* hidraw already checked that data_len < HID_MAX_BUFFER_SIZE */
+       /* hid_hw_* already checked that data_len < HID_MAX_BUFFER_SIZE */
        u16 size =      2                       /* size */ +
                        (reportID ? 1 : 0)      /* reportID */ +
                        data_len                /* buf */;

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 09fbbd7fb7848b74914d0aa2688d81e2cd44b0e0..60f3ff7623764919f226aef493af78adfef5c31f 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -989,6 +989,9 @@ static inline int hid_hw_raw_request(struct hid_device *hdev,
                                  unsigned char reportnum, __u8 *buf,
                                  size_t len, unsigned char rtype, int reqtype)
 {
+       if (len < 1 || len > HID_MAX_BUFFER_SIZE || !buf)
+               return -EINVAL;
+
        if (hdev->ll_driver->raw_request)
                return hdev->ll_driver->raw_request(hdev, reportnum, buf, len,
                                                    rtype, reqtype);
@@ -1008,6 +1011,9 @@ static inline int hid_hw_raw_request(struct hid_device *hdev,
 static inline int hid_hw_output_report(struct hid_device *hdev, __u8 *buf,
                                        size_t len)
 {
+       if (len < 1 || len > HID_MAX_BUFFER_SIZE || !buf)
+               return -EINVAL;
+
        if (hdev->ll_driver->output_report)
                return hdev->ll_driver->output_report(hdev, buf, len);