[xorg-x11-drv-wacom/f17] Fix arrray overflow in the serial ID property

Peter Hutterer whot at fedoraproject.org
Thu Mar 1 21:35:57 UTC 2012


commit 0dca2b6e31b0feea7bdd22839f0b0e11c47d05b1
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 2 07:37:20 2012 +1000

    Fix arrray overflow in the serial ID property

 ...-Fix-invalid-array-size-for-serial-values.patch |   28 ++++++++++++++++++++
 xorg-x11-drv-wacom.spec                            |    6 +++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-wcmXCommand-Fix-invalid-array-size-for-serial-values.patch b/0001-wcmXCommand-Fix-invalid-array-size-for-serial-values.patch
new file mode 100644
index 0000000..9b8db43
--- /dev/null
+++ b/0001-wcmXCommand-Fix-invalid-array-size-for-serial-values.patch
@@ -0,0 +1,28 @@
+From e89581fa104bbe52c3bc076d947d9d8fe4e7dc60 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 1 Mar 2012 15:40:48 -0500
+Subject: [PATCH] wcmXCommand: Fix invalid array size for serial values.
+
+Introduced in c21b6876b435bb34112956716fea14477ef9e8d7
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/wcmXCommand.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
+index 57b3f20..883b3b1 100644
+--- a/src/wcmXCommand.c
++++ b/src/wcmXCommand.c
+@@ -870,7 +870,7 @@ int wcmGetProperty (DeviceIntPtr dev, Atom property)
+ 
+ 	if (property == prop_serials)
+ 	{
+-		uint32_t values[4];
++		uint32_t values[5];
+ 
+ 		values[0] = common->tablet_id;
+ 		values[1] = priv->old_serial;
+-- 
+1.7.7.6
+
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 61ee05c..d3ec605 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -8,7 +8,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.13.0
-Release:    5%{?gitdate:.%{gitdate}}%{?dist}
+Release:    6%{?gitdate:.%{gitdate}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -21,6 +21,7 @@ Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{versio
 Source1: 70-wacom.rules
 
 Patch01: 0001-Export-current-tool-ID-in-the-property-too.patch
+Patch02: 0001-wcmXCommand-Fix-invalid-array-size-for-serial-values.patch
 
 ExcludeArch: s390 s390x
 
@@ -102,6 +103,9 @@ X.Org X11 wacom input driver development files.
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Fri Mar 02 2012 Peter Hutterer <peter.hutterer at redhat.com> 0.13.0-6
+- Fix arrray overflow in the serial ID property
+
 * Thu Feb 23 2012 Peter Hutterer <peter.hutterer at redhat.com> 0.13.0-5
 - Export current tool ID through the serial ID property
 


More information about the scm-commits mailing list