[xorg-x11-drv-synaptics/f20] Fix crash when initializing unknown axes (#1177551)

[Peter Hutterer]

commit ef13d1a2d36148b24519bb3739d5f0aae88a5d27
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jan 5 09:18:29 2015 +1000

    Fix crash when initializing unknown axes (#1177551)

 ...tcomm-add-missing-axis-labels-to-avoid-ar.patch |   45 ++++++++++++++++++++
 xorg-x11-drv-synaptics.spec                        |    7 +++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/0001-Revert-eventcomm-add-missing-axis-labels-to-avoid-ar.patch b/0001-Revert-eventcomm-add-missing-axis-labels-to-avoid-ar.patch
new file mode 100644
index 0000000..1cdf902
--- /dev/null
+++ b/0001-Revert-eventcomm-add-missing-axis-labels-to-avoid-ar.patch
@@ -0,0 +1,45 @@
+From c6b2bb17006a6dc4a6953eab0d27a572cf9d8c87 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Mon, 5 Jan 2015 09:11:19 +1000
+Subject: [PATCH synaptics] Revert "eventcomm: add missing axis labels to avoid
+ array overrun"
+
+This reverts commit fbf8df16694dd60d854f05f1f59a786c3df3529a.
+---
+ src/eventcomm.c | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/src/eventcomm.c b/src/eventcomm.c
+index 801d19f..3b32425 100644
+--- a/src/eventcomm.c
++++ b/src/eventcomm.c
+@@ -865,9 +865,6 @@ event_query_touch(InputInfoPtr pInfo)
+             AXIS_LABEL_PROP_ABS_MT_BLOB_ID,
+             AXIS_LABEL_PROP_ABS_MT_TRACKING_ID,
+             AXIS_LABEL_PROP_ABS_MT_PRESSURE,
+-            AXIS_LABEL_PROP_ABS_MT_DISTANCE,
+-            AXIS_LABEL_PROP_ABS_MT_TOOL_X,
+-            AXIS_LABEL_PROP_ABS_MT_TOOL_Y,
+         };
+ 
+         if (mtdev->caps.slot.maximum > 0)
+@@ -898,14 +895,8 @@ event_query_touch(InputInfoPtr pInfo)
+                 case ABS_MT_TRACKING_ID - ABS_MT_TOUCH_MAJOR:
+                     break;
+ 
+-                    if (i >= sizeof(labels)/sizeof(labels[0])) {
+-                        xf86IDrvMsg(pInfo, X_ERROR,
+-                                    "Axis %d out of label range. This is a bug\n",
+-                                    i);
+-                        priv->touch_axes[axnum].label = NULL;
+-                    } else
+-                        priv->touch_axes[axnum].label = labels[i];
+-
++                default:
++                    priv->touch_axes[axnum].label = labels[i];
+                     priv->touch_axes[axnum].min = mtdev->caps.abs[i].minimum;
+                     priv->touch_axes[axnum].max = mtdev->caps.abs[i].maximum;
+                     /* Kernel provides units/mm, X wants units/m */
+-- 
+2.1.0
+
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 78846da..9fad5b7 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -8,7 +8,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.7.7
-Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -23,6 +23,8 @@ Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.
 Source3:        50-synaptics.conf
 Source4:        70-touchpad-quirks.rules
 
+Patch01:        0001-Revert-eventcomm-add-missing-axis-labels-to-avoid-ar.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  git
@@ -140,6 +142,9 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Mon Jan 05 2015 Peter Hutterer <peter.hutterer at redhat.com> 1.7.7-2
+- Fix crash when initializing unknown axes (#1177551)
+
 * Mon Dec 22 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.7.7-1
 - synaptics 1.7.7