From 9978b3ed84b24d5fe69e7497a8f708bb5e1e0b32 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 26 Apr 2013 09:49:20 +0000 Subject: xserver_xorg-server: bump to version 1.12.4 and add security patch Bump to version 1.12.4 and add a security patch for CVE-2013-1940. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../xserver_xorg-server-01-aarch64-support.patch | 23 +++++++++++++++ .../xserver_xorg-server-02-cve-2013-1940.patch | 34 ++++++++++++++++++++++ .../xserver_xorg-server-aarch64-support.patch | 23 --------------- .../xserver_xorg-server/xserver_xorg-server.mk | 2 +- 4 files changed, 58 insertions(+), 24 deletions(-) create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-01-aarch64-support.patch create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch (limited to 'package/x11r7') diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-aarch64-support.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-aarch64-support.patch new file mode 100644 index 000000000..ec497c809 --- /dev/null +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-aarch64-support.patch @@ -0,0 +1,23 @@ +Add necessary definitions for AArch64 + +Signed-off-by: Thomas Petazzoni + +Index: xserver_xorg-server-1.9.4/include/servermd.h +=================================================================== +--- xserver_xorg-server-1.9.4.orig/include/servermd.h 2009-11-04 20:31:46.000000000 +0100 ++++ xserver_xorg-server-1.9.4/include/servermd.h 2012-12-28 18:16:55.000000000 +0100 +@@ -68,6 +68,14 @@ + * GLYPHPADBYTES is used. + */ + ++#ifdef __aarch64__ ++ ++# define IMAGE_BYTE_ORDER LSBFirst ++# define BITMAP_BIT_ORDER LSBFirst ++# define GLYPHPADBYTES 4 ++ ++#endif ++ + #ifdef __avr32__ + + #define IMAGE_BYTE_ORDER MSBFirst diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch new file mode 100644 index 000000000..d85494f90 --- /dev/null +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch @@ -0,0 +1,34 @@ +From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Wed, 10 Apr 2013 06:09:01 +0000 +Subject: xf86: fix flush input to work with Linux evdev devices. + +So when we VT switch back and attempt to flush the input devices, +we don't succeed because evdev won't return part of an event, +since we were only asking for 4 bytes, we'd only get -EINVAL back. + +This could later cause events to be flushed that we shouldn't have +gotten. + +This is a fix for CVE-2013-1940. + +Signed-off-by: Dave Airlie +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- +diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c +index ab3757a..4d08c1e 100644 +--- a/hw/xfree86/os-support/shared/posix_tty.c ++++ b/hw/xfree86/os-support/shared/posix_tty.c +@@ -421,7 +421,8 @@ xf86FlushInput(int fd) + { + fd_set fds; + struct timeval timeout; +- char c[4]; ++ /* this needs to be big enough to flush an evdev event. */ ++ char c[256]; + + DebugF("FlushingSerial\n"); + if (tcflush(fd, TCIFLUSH) == 0) +-- +cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch deleted file mode 100644 index ec497c809..000000000 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch +++ /dev/null @@ -1,23 +0,0 @@ -Add necessary definitions for AArch64 - -Signed-off-by: Thomas Petazzoni - -Index: xserver_xorg-server-1.9.4/include/servermd.h -=================================================================== ---- xserver_xorg-server-1.9.4.orig/include/servermd.h 2009-11-04 20:31:46.000000000 +0100 -+++ xserver_xorg-server-1.9.4/include/servermd.h 2012-12-28 18:16:55.000000000 +0100 -@@ -68,6 +68,14 @@ - * GLYPHPADBYTES is used. - */ - -+#ifdef __aarch64__ -+ -+# define IMAGE_BYTE_ORDER LSBFirst -+# define BITMAP_BIT_ORDER LSBFirst -+# define GLYPHPADBYTES 4 -+ -+#endif -+ - #ifdef __avr32__ - - #define IMAGE_BYTE_ORDER MSBFirst diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index f0b19aad3..1c514560c 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.12.2 +XSERVER_XORG_SERVER_VERSION = 1.12.4 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make -- cgit v1.2.3