From 6738ccf88c44829d04ce7db7f9e0a21d64daf01e Mon Sep 17 00:00:00 2001
From: Kevin Daughtridge <kevin@kdau.com>
Date: Thu, 20 Sep 2012 12:00:32 -0700
Subject: [PATCH] --- yaml --- r: 323487 b: refs/heads/master c:
 86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6 h: refs/heads/master i:   323485:
 3a15f5305e81919566feaf73204cb16c172406fe   323483:
 f706ff7a085edea9fd5ec8e718d24a4f63a3273e   323479:
 4d8e4381b2e369ee10b8a4da43a6f9ba85f939f4   323471:
 b8a6d4f3c85eed5b22cb534fc63ead226ea8e5dc   323455:
 6846110fc1446a4041647057138cb4b7626d8984 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/hid/hid-core.c        | 16 +++++++++++++---
 trunk/drivers/hid/usbhid/hid-core.c |  6 +++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5df6edd0321d..04e00efa410e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cc9834518efed3b69d3a8ff3bd162e089f68d34
+refs/heads/master: 86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6
diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c
index dd679a582c2c..ec917690c263 100644
--- a/trunk/drivers/hid/hid-core.c
+++ b/trunk/drivers/hid/hid-core.c
@@ -757,6 +757,7 @@ int hid_open_report(struct hid_device *device)
 	struct hid_item item;
 	unsigned int size;
 	__u8 *start;
+	__u8 *buf;
 	__u8 *end;
 	int ret;
 	static int (*dispatch_type[])(struct hid_parser *parser,
@@ -775,12 +776,21 @@ int hid_open_report(struct hid_device *device)
 		return -ENODEV;
 	size = device->dev_rsize;
 
+	buf = kmemdup(start, size, GFP_KERNEL);
+	if (buf == NULL)
+		return -ENOMEM;
+
 	if (device->driver->report_fixup)
-		start = device->driver->report_fixup(device, start, &size);
+		start = device->driver->report_fixup(device, buf, &size);
+	else
+		start = buf;
 
-	device->rdesc = kmemdup(start, size, GFP_KERNEL);
-	if (device->rdesc == NULL)
+	start = kmemdup(start, size, GFP_KERNEL);
+	kfree(buf);
+	if (start == NULL)
 		return -ENOMEM;
+
+	device->rdesc = start;
 	device->rsize = size;
 
 	parser = vzalloc(sizeof(struct hid_parser));
diff --git a/trunk/drivers/hid/usbhid/hid-core.c b/trunk/drivers/hid/usbhid/hid-core.c
index dedd8e4e5c6d..8e0c4bf94ebc 100644
--- a/trunk/drivers/hid/usbhid/hid-core.c
+++ b/trunk/drivers/hid/usbhid/hid-core.c
@@ -1415,20 +1415,20 @@ static int hid_post_reset(struct usb_interface *intf)
 	 * configuration descriptors passed, we already know that
 	 * the size of the HID report descriptor has not changed.
 	 */
-	rdesc = kmalloc(hid->rsize, GFP_KERNEL);
+	rdesc = kmalloc(hid->dev_rsize, GFP_KERNEL);
 	if (!rdesc) {
 		dbg_hid("couldn't allocate rdesc memory (post_reset)\n");
 		return 1;
 	}
 	status = hid_get_class_descriptor(dev,
 				interface->desc.bInterfaceNumber,
-				HID_DT_REPORT, rdesc, hid->rsize);
+				HID_DT_REPORT, rdesc, hid->dev_rsize);
 	if (status < 0) {
 		dbg_hid("reading report descriptor failed (post_reset)\n");
 		kfree(rdesc);
 		return 1;
 	}
-	status = memcmp(rdesc, hid->rdesc, hid->rsize);
+	status = memcmp(rdesc, hid->dev_rdesc, hid->dev_rsize);
 	kfree(rdesc);
 	if (status != 0) {
 		dbg_hid("report descriptor changed\n");