debian/changelog | 5 +
debian/patches/45_GetKeyboardEvents_reject_out-of-range_keycodes.diff | 33
++++++++++
debian/patches/series | 1
3 files changed, 38 insertions(+), 1 deletion(-)
New commits:
commit 52515167711a69d380ef717f07333400896b57ec
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sun Sep 23 18:25:55 2007 +0200
Add 45_GetKeyboardEvents_reject_out-of-range_keycodes.diff
diff --git a/debian/changelog b/debian/changelog
index 625b5db..b4b27f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
* Add upstream commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe as patch
44_XKB_mapping_changes_for_all_core-sending_devices.diff to fix broken
xmodmap invocation in .xsession, closes: #443044.
+ * Add upstream commit 0e800ca4651a947ccef239e6fe7bf64aab92257c as patch
+ 45_GetKeyboardEvents_reject_out-of-range_keycodes.diff to fix crash
+ in GetKeyboardValuatorEvents, closes: #443697.
[ Christian Perrier ]
* Debconf templates and debian/control reviewed by the debian-l10n-
@@ -45,7 +48,7 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
debian/patches/series.
* Don't build kdrive-based servers we're not shipping.
- -- Brice Goglin <[EMAIL PROTECTED]> Sun, 23 Sep 2007 17:32:49 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Sun, 23 Sep 2007 18:23:39 +0200
xorg-server (2:1.4-2) unstable; urgency=low
diff --git
a/debian/patches/45_GetKeyboardEvents_reject_out-of-range_keycodes.diff
b/debian/patches/45_GetKeyboardEvents_reject_out-of-range_keycodes.diff
new file mode 100644
index 0000000..ac9cd52
--- /dev/null
+++ b/debian/patches/45_GetKeyboardEvents_reject_out-of-range_keycodes.diff
@@ -0,0 +1,33 @@
+From: Daniel Stone <[EMAIL PROTECTED]>
+Date: Sun, 23 Sep 2007 09:43:31 +0000 (+0300)
+Subject: GetKeyboardEvents: Reject out-of-range keycodes (bug #12528)
+X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=0e800ca4651a947ccef239e6fe7bf64aab92257c
+
+GetKeyboardEvents: Reject out-of-range keycodes (bug #12528)
+
+We can only deal with keycodes between 8 and 255, so make sure that we never
+accept anything out of this range.
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443697
+---
+
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -402,6 +402,7 @@ GetKeyboardValuatorEvents(xEvent *events
+ if (!events)
+ return 0;
+
++ /* DO NOT WANT */
+ if (type != KeyPress && type != KeyRelease)
+ return 0;
+
+@@ -409,6 +410,9 @@ GetKeyboardValuatorEvents(xEvent *events
+ (pDev->coreEvents && !inputInfo.keyboard->key))
+ return 0;
+
++ if (key_code < 8 || key_code > 255)
++ return 0;
++
+ if (pDev->coreEvents)
+ numEvents = 2;
+ else
diff --git a/debian/patches/series b/debian/patches/series
index 3d6c803..1a9b468 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,7 @@
42_fix_RemoveGeneralSocket_crash_from_dbus.diff
43_allow_override_BIOS_EDID_preferred_mode.diff
44_XKB_mapping_changes_for_all_core-sending_devices.diff
+45_GetKeyboardEvents_reject_out-of-range_keycodes.diff
#47_fbdevhw_magic_numbers.diff
#51_xkb-and-loathing.diff
91_ttf2pt1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
