From 7bc48c666d702e649dc529b5d928b6a8549514c3 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 23 Jun 2009 15:43:16 +1000
Subject: Fix wrong axis label index causing OOB reads/writes.

The atoms array is filled with each axis atom in mapping order (i.e. after
the driver mapping has been applied). 'axis' OTOH is from 0 to ABS_MAX.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/evdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evdev.c b/src/evdev.c
index 922d5f3..12c3e0d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1035,7 +1035,7 @@ EvdevAddAbsClass(DeviceIntPtr device)
         pEvdev->axis_map[axis] = i;
         xf86InitValuatorAxisStruct(device, i,
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-                                   atoms[axis],
+                                   atoms[i],
 #endif
                                    pEvdev->absinfo[axis].minimum,
                                    pEvdev->absinfo[axis].maximum,
-- 
cgit v1.2.3