diff --git a/u_exa-only-draw-valid-trapezoids.patch b/u_exa-only-draw-valid-trapezoids.patch deleted file mode 100644 index e0b3168..0000000 --- a/u_exa-only-draw-valid-trapezoids.patch +++ /dev/null @@ -1,33 +0,0 @@ -Author: Maarten Lankhorst -Subject: exa: only draw valid trapezoids -Patch-Mainline: To be upstreamed -References: bnc#853846 CVE-2013-6424 -Signed-off-by: Michal Srb - -diff --git a/exa/exa_render.c b/exa/exa_render.c -index 172e2b5..807eeba 100644 ---- a/exa/exa_render.c -+++ b/exa/exa_render.c -@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, - - exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - for (; ntrap; ntrap--, traps++) -- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); -+ if (xTrapezoidValid(traps)) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); - exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - - xRel = bounds.x1 + xSrc - xDst; -diff --git a/render/picture.h b/render/picture.h -index c85353a..fcd6401 100644 ---- a/render/picture.h -+++ b/render/picture.h -@@ -211,7 +211,7 @@ typedef pixman_fixed_t xFixed; - /* whether 't' is a well defined not obviously empty trapezoid */ - #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ - (t)->right.p1.y != (t)->right.p2.y && \ -- (int) ((t)->bottom - (t)->top) > 0) -+ ((t)->bottom > (t)->top)) - - /* - * Standard NTSC luminance conversions: diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 2794a37..fd1d543 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 2 13:46:34 UTC 2016 - sndirsch@suse.com + +- removed u_exa-only-draw-valid-trapezoids.patch; no longer needed + since pixman 0.32.0 + ------------------------------------------------------------------- Fri Apr 29 08:40:24 UTC 2016 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index a74ad54..95a72ba 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -187,8 +187,6 @@ Patch101: u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grab # PATCH-FIX-UPSTREAM u_x86emu-include-order.patch schwab@suse.de -- Change include order to avoid conflict with system header, remove duplicate definitions Patch102: u_x86emu-include-order.patch Patch104: u_xorg-server-xdmcp.patch -# PATCH-FIX-UPSTREAM u_exa-only-draw-valid-trapezoids.patch bnc#853846 msrb@suse.com -- Fixes possible crash of server using invalid trapezoids. 2013-12-12 patch is waiting in mailing list to be upstreamed. -Patch106: u_exa-only-draw-valid-trapezoids.patch Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch Patch115: N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch @@ -324,7 +322,6 @@ sh %{SOURCE92} --verify . %{SOURCE91} #%patch101 -p1 %patch102 -p1 %patch104 -p1 -%patch106 -p1 %patch112 -p1