3.4-stable patches

added patches:
	dj-memory-scribble-in-logi_dj.patch

diff --git a/queue-3.4/dj-memory-scribble-in-logi_dj.patch b/queue-3.4/dj-memory-scribble-in-logi_dj.patch
new file mode 100644 (file)
index 0000000..69c3e83
--- /dev/null
+++ b/queue-3.4/dj-memory-scribble-in-logi_dj.patch
@@ -0,0 +1,41 @@
+From 8a55ade76551e3927b4e41ee9e7751875d18bc25 Mon Sep 17 00:00:00 2001
+From: Alan Cox <alan@linux.intel.com>
+Date: Tue, 4 Sep 2012 15:10:08 +0100
+Subject: dj: memory scribble in logi_dj
+
+From: Alan Cox <alan@linux.intel.com>
+
+commit 8a55ade76551e3927b4e41ee9e7751875d18bc25 upstream.
+
+Allocate a structure not a pointer to it !
+
+Signed-off-by: Alan Cox <alan@linux.intel.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Yijing Wang <wangyijing@huawei.com>
+Cc: Marc Dionne <marc.c.dionne@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-logitech-dj.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/hid/hid-logitech-dj.c
++++ b/drivers/hid/hid-logitech-dj.c
+@@ -477,7 +477,7 @@ static int logi_dj_recv_query_paired_dev
+       struct dj_report *dj_report;
+       int retval;
+ 
+-      dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
++      dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
+       if (!dj_report)
+               return -ENOMEM;
+       dj_report->report_id = REPORT_ID_DJ_SHORT;
+@@ -495,7 +495,7 @@ static int logi_dj_recv_switch_to_dj_mod
+       struct dj_report *dj_report;
+       int retval;
+ 
+-      dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
++      dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
+       if (!dj_report)
+               return -ENOMEM;
+       dj_report->report_id = REPORT_ID_DJ_SHORT;

diff --git a/queue-3.4/series b/queue-3.4/series
index 75d179a9a8e36cc8e01eeec1244d798ff2e55bba..c976be8e490ccfe62520eefd009c11130d54ef5e 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -212,3 +212,4 @@ net-add-net_ratelimited_function-and-net_-level-_ratelimited-macros.patch
 xen-netfront-reduce-gso_max_size-to-account-for-max-tcp-header.patch
 pci-aspm-don-t-touch-aspm-if-forcibly-disabled.patch
 hid-logitech-don-t-use-stack-based-dj_report-structures.patch
+dj-memory-scribble-in-logi_dj.patch