diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-06-25 14:20:02 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-27 22:42:54 +0100 |
commit | f8b25377a68ae4b3105d0c137a3a0368c0fe1e67 (patch) | |
tree | 6aa084fb89c9b604c41cf2b5a4aaf581fb87caf3 /meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch | |
parent | c11d4c9482c4ff773c19a0fa3c0f5489a6f186e3 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch | 31 |
1 files changed, 0 insertions, 31 deletions
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 @@ | |||
1 | This patch comes from: | ||
2 | http://lists.x.org/archives/xorg-devel/2013-October/037996.html | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | |||
6 | Signed-off-by: Baogen shang <baogen.shang@windriver.com> | ||
7 | diff -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; | ||
20 | diff -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: | ||