[Xquartz-changes] xserver: Changes to 'server-1.17-branch'
Jeremy Huddleston
jeremyhu at freedesktop.org
Sun Feb 15 00:40:26 PST 2015
New branch 'server-1.17-branch' available with the following commits:
commit 3b0d1ba2266d2780bfc111bab74885b90458eca4
Author: Keith Packard <keithp at keithp.com>
Date: Tue Feb 10 14:43:34 2015 -0800
Release 1.17.1
Signed-off-by: Keith Packard <keithp at keithp.com>
commit f160e722672dbb2b5215870b47bcc51461d96ff1
Author: Olivier Fourdan <ofourdan at redhat.com>
Date: Fri Jan 16 08:44:45 2015 +0100
xkb: Check strings length against request size
Ensure that the given strings length in an XkbSetGeometry request remain
within the limits of the size of the request.
Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43)
commit 29be310c303914090298ddda93a5bd5d00a94945
Author: Olivier Fourdan <ofourdan at redhat.com>
Date: Fri Jan 16 20:08:59 2015 +0100
xkb: Don't swap XkbSetGeometry data in the input buffer
The XkbSetGeometry request embeds data which needs to be swapped when the
server and the client have different endianess.
_XkbSetGeometry() invokes functions that swap these data directly in the
input buffer.
However, ProcXkbSetGeometry() may call _XkbSetGeometry() more than once
(if there is more than one keyboard), thus causing on swapped clients the
same data to be swapped twice in memory, further causing a server crash
because the strings lengths on the second time are way off bounds.
To allow _XkbSetGeometry() to run reliably more than once with swapped
clients, do not swap the data in the buffer, use variables instead.
Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit 81c90dc8f0aae3b65730409b1b615b5fa7280ebd)
More information about the Xquartz-changes
mailing list