]> Pileus Git - ~andy/linux/commitdiff
HID: fix buffer allocations
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Sun, 2 Feb 2014 04:23:10 +0000 (23:23 -0500)
committerJiri Kosina <jkosina@suse.cz>
Mon, 3 Feb 2014 10:02:01 +0000 (11:02 +0100)
When using hid_output_report(), the buffer should be allocated by hid_alloc_report_buf(),
not a custom malloc.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-input.c
drivers/hid/i2c-hid/i2c-hid.c

index d50e7313b171e4e9bd732cbee40a1a5cd5e501b5..a713e6211419c880ddd0a39597b78f16ad84919a 100644 (file)
@@ -1178,7 +1178,7 @@ static void hidinput_led_worker(struct work_struct *work)
 
        /* fall back to generic raw-output-report */
        len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
-       buf = kmalloc(len, GFP_KERNEL);
+       buf = hid_alloc_report_buf(report, GFP_KERNEL);
        if (!buf)
                return;
 
index e914f27554913ab08c903be673a5c641731058b6..ce68a120ba26a628b595d75cbaf15ddfa99f5b63 100644 (file)
@@ -582,7 +582,7 @@ static void i2c_hid_request(struct hid_device *hid, struct hid_report *rep,
        int ret;
        int len = i2c_hid_get_report_length(rep) - 2;
 
-       buf = kzalloc(len, GFP_KERNEL);
+       buf = hid_alloc_report_buf(rep, GFP_KERNEL);
        if (!buf)
                return;