[kernel] r19370 - in dists/sid/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun Sep  9 17:07:24 2012
New Revision: 19370

Log:
speakup: Fix crash on 'goto' operation (Closes: #685953)

Added:
   dists/sid/linux/debian/patches/bugfix/all/staging-speakup-fix-an-improperly-declared-variable.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Sep  7 02:33:55 2012	(r19369)
+++ dists/sid/linux/debian/changelog	Sun Sep  9 17:07:24 2012	(r19370)
@@ -111,6 +111,7 @@
   * [i386/686-pae] video: Disable Geode framebuffer drivers, not used with
     any chips that support PAE
   * [x86] drm/i915: Fix i8xx interrupt handling (Closes: #655152)
+  * speakup: Fix crash on 'goto' operation (Closes: #685953)
 
   [ Bastian Blank ]
   * Make xen-linux-system meta-packages depend on xen-system. This allows

Added: dists/sid/linux/debian/patches/bugfix/all/staging-speakup-fix-an-improperly-declared-variable.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/all/staging-speakup-fix-an-improperly-declared-variable.patch	Sun Sep  9 17:07:24 2012	(r19370)
@@ -0,0 +1,30 @@
+From: Christopher Brannon <chris at the-brannons.com>
+Date: Sat, 16 Jun 2012 16:55:20 -0500
+Subject: Staging: speakup: fix an improperly-declared variable.
+
+commit 4ea418b8b2fa8a70d0fcc8231b65e67b3a72984b upstream.
+
+A local static variable was declared as a pointer to a string
+constant.  We're assigning to the underlying memory, so it
+needs to be an array instead.
+
+Signed-off-by: Christopher Brannon <chris at the-brannons.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/staging/speakup/main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
+index 92b34e2..40e2488 100644
+--- a/drivers/staging/speakup/main.c
++++ b/drivers/staging/speakup/main.c
+@@ -1854,7 +1854,7 @@ static void speakup_bits(struct vc_data *vc)
+ 
+ static int handle_goto(struct vc_data *vc, u_char type, u_char ch, u_short key)
+ {
+-	static u_char *goto_buf = "\0\0\0\0\0\0";
++	static u_char goto_buf[8];
+ 	static int num;
+ 	int maxlen, go_pos;
+ 	char *cp;

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Fri Sep  7 02:33:55 2012	(r19369)
+++ dists/sid/linux/debian/patches/series	Sun Sep  9 17:07:24 2012	(r19370)
@@ -394,3 +394,4 @@
 bugfix/all/usb-Add-USB_QUIRK_RESET_RESUME-for-all-Logitech-UVC-.patch
 bugfix/alpha/alpha-use-large-data-model.diff
 bugfix/x86/drm-i915-i8xx-interrupt-handler.patch
+bugfix/all/staging-speakup-fix-an-improperly-declared-variable.patch