summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-06-25 14:20:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-27 22:42:54 +0100
commitf8b25377a68ae4b3105d0c137a3a0368c0fe1e67 (patch)
tree6aa084fb89c9b604c41cf2b5a4aaf581fb87caf3
parentc11d4c9482c4ff773c19a0fa3c0f5489a6f186e3 (diff)
downloadpoky-f8b25377a68ae4b3105d0c137a3a0368c0fe1e67.tar.gz
xorg-xserver: Upgrade 1.17.1 -> 1.17.2
Fixes CVE-2015-3164 in Xwayland. Remove unnecessary patches: * fix_open_max_preprocessor_error.patch is no longer needed: OPEN_MAX is defined in every case now * xorg-CVE-2013-6424.patch was handled in pixman several releases ago * other removed patches are included in 1.17.2 (From OE-Core rev: 1d35231d666baee9ac4aaeb482371f3c71998c76) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch50
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch48
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch15
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch31
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch38
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.1.bb)13
6 files changed, 3 insertions, 192 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
deleted file mode 100644
index 28b3218a30..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
3Date: Sat, 7 Feb 2015 18:13:21 +0100
4Subject: [PATCH] int10: Fix error check for pci_device_map_legacy
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9pci_device_map_legacy returns 0 on success.
10
11Upstream-status: backport 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
12
13Signed-off-by: Jürg Billeter <j@bitron.ch>
14Reviewed-by: Adam Jackson <ajax@redhat.com>
15Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
16Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
17---
18 hw/xfree86/int10/generic.c | 2 +-
19 hw/xfree86/os-support/linux/int10/linux.c | 2 +-
20 2 files changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
23index 012d194..8d5c4da 100644
24--- a/hw/xfree86/int10/generic.c
25+++ b/hw/xfree86/int10/generic.c
26@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
27 {
28 void *map;
29
30- if (!pci_device_map_legacy(dev, 0, len, 0, &map))
31+ if (pci_device_map_legacy(dev, 0, len, 0, &map))
32 return FALSE;
33
34 memcpy(buf, map, len);
35diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
36index 79b9a88..6ca118f 100644
37--- a/hw/xfree86/os-support/linux/int10/linux.c
38+++ b/hw/xfree86/os-support/linux/int10/linux.c
39@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
40 {
41 void *map;
42
43- if (!pci_device_map_legacy(dev, base, len, 0, &map))
44+ if (pci_device_map_legacy(dev, base, len, 0, &map))
45 return FALSE;
46
47 memcpy(buf, map, len);
48--
492.1.4
50
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
deleted file mode 100644
index 9c9f595fa6..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001
5From: Egbert Eich <eich@freedesktop.org>
6Date: Tue, 3 Mar 2015 16:27:05 +0100
7Subject: symbols: Fix sdksyms.sh to cope with gcc5
8
9Gcc5 adds additional lines stating line numbers before and
10after __attribute__() which need to be skipped.
11
12Signed-off-by: Egbert Eich <eich@freedesktop.org>
13Tested-by: Daniel Stone <daniels@collabora.com>
14Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
15
16diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
17index 2305073..05ac410 100755
18--- a/hw/xfree86/sdksyms.sh
19+++ b/hw/xfree86/sdksyms.sh
20@@ -350,13 +350,25 @@ BEGIN {
21 if (sdk) {
22 n = 3;
23
24+ # skip line numbers GCC 5 adds before __attribute__
25+ while ($n == "" || $0 ~ /^# [0-9]+ "/) {
26+ getline;
27+ n = 1;
28+ }
29+
30 # skip attribute, if any
31 while ($n ~ /^(__attribute__|__global)/ ||
32 # skip modifiers, if any
33 $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ ||
34 # skip pointer
35- $n ~ /^[a-zA-Z0-9_]*\*$/)
36+ $n ~ /^[a-zA-Z0-9_]*\*$/) {
37 n++;
38+ # skip line numbers GCC 5 adds after __attribute__
39+ while ($n == "" || $0 ~ /^# [0-9]+ "/) {
40+ getline;
41+ n = 1;
42+ }
43+ }
44
45 # type specifier may not be set, as in
46 # extern _X_EXPORT unsigned name(...)
47--
48cgit v0.10.2
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
deleted file mode 100644
index 2f629724c9..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Pending
2
3Index: git/os/osdep.h
4===================================================================
5--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
6+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100
7@@ -92,7 +92,7 @@
8 * like sysconf(_SC_OPEN_MAX) is not supported.
9 */
10
11-#if OPEN_MAX <= 256
12+#if 0
13 #define MAXSOCKS (OPEN_MAX - 1)
14 #else
15 #define MAXSOCKS 256
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch
deleted file mode 100644
index 7c6153022f..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1This patch comes from:
2http://lists.x.org/archives/xorg-devel/2013-October/037996.html
3
4Upstream-Status: Backport
5
6Signed-off-by: Baogen shang <baogen.shang@windriver.com>
7diff -Naur xorg-server-1.14.0-orig/exa/exa_render.c xorg-server-1.14.0/exa/exa_render.c
8--- xorg-server-1.14.0-orig/exa/exa_render.c 2014-02-27 14:32:38.000000000 +0800
9+++ xorg-server-1.14.0/exa/exa_render.c 2014-02-27 15:46:59.000000000 +0800
10@@ -1141,7 +1141,8 @@
11
12 exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
13 for (; ntrap; ntrap--, traps++)
14- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
15+ if (xTrapezoidValid(traps))
16+ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
17 exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
18
19 xRel = bounds.x1 + xSrc - xDst;
20diff -Naur xorg-server-1.14.0-orig/render/picture.h xorg-server-1.14.0/render/picture.h
21--- xorg-server-1.14.0-orig/render/picture.h 2014-02-27 14:32:26.000000000 +0800
22+++ xorg-server-1.14.0/render/picture.h 2014-02-27 15:48:13.000000000 +0800
23@@ -211,7 +211,7 @@
24 /* whether 't' is a well defined not obviously empty trapezoid */
25 #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \
26 (t)->right.p1.y != (t)->right.p2.y && \
27- (int) ((t)->bottom - (t)->top) > 0)
28+ ((t)->bottom > (t)->top))
29
30 /*
31 * Standard NTSC luminance conversions:
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch
deleted file mode 100644
index e6dba04919..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4Since _XSERVTransClose frees the connection pointer passed to it,
5remove that pointer from the array, so we don't try to double free it
6if we come back into CloseWellKnownConnections again.
7
8Should fix https://bugzilla.yoctoproject.org/show_bug.cgi?id=6665 in which
9the shutdown section of the main() loop called CloseWellKnownConnections()
10and then moved on to ddxGiveUp(), which failed to release the VT and thus
11called AbortServer(), which called CloseWellKnownConnections() again.
12
13Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
14Reviewed-by: Adam Jackson <ajax@redhat.com>
15---
16 os/connection.c | 9 +++++++--
17 1 file changed, 7 insertions(+), 2 deletions(-)
18
19diff --git a/os/connection.c b/os/connection.c
20index ddfe50a..7ff44e1 100644
21--- a/os/connection.c
22+++ b/os/connection.c
23@@ -513,8 +513,13 @@ CloseWellKnownConnections(void)
24 {
25 int i;
26
27- for (i = 0; i < ListenTransCount; i++)
28- _XSERVTransClose(ListenTransConns[i]);
29+ for (i = 0; i < ListenTransCount; i++) {
30+ if (ListenTransConns[i] != NULL) {
31+ _XSERVTransClose(ListenTransConns[i]);
32+ ListenTransConns[i] = NULL;
33+ }
34+ }
35+ ListenTransCount = 0;
36 }
37
38 static void
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
index edca51e568..3039d303dc 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
@@ -1,16 +1,9 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2 2
3# Misc build failure for master HEAD 3SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
4SRC_URI += "file://fix_open_max_preprocessor_error.patch \
5 file://xorg-CVE-2013-6424.patch \
6 file://xtrans.patch \
7 file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
8 file://0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch \
9 file://0001-int10-Fix-error-check-for-pci_device_map_legacy.patch \
10 " 4 "
11 5SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad"
12SRC_URI[md5sum] = "5986510d59e394a50126a8e2833e79d3" 6SRC_URI[sha256sum] = "f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993"
13SRC_URI[sha256sum] = "2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab"
14 7
15# These extensions are now integrated into the server, so declare the migration 8# These extensions are now integrated into the server, so declare the migration
16# path for in-place upgrades. 9# path for in-place upgrades.