X Strike Force X.Org X11 SVN commit: r2079 - in trunk/xserver/xorg-server-1.0.2/debian: . patches
Author: dnusinow
Date: 2006-05-02 21:52:55 -0400 (Tue, 02 May 2006)
New Revision: 2079
Added:
trunk/xserver/xorg-server-1.0.2/debian/patches/15_security_allocate_local.diff
Modified:
trunk/xserver/xorg-server-1.0.2/debian/changelog
trunk/xserver/xorg-server-1.0.2/debian/patches/series
Log:
* Add 15_security_allocate_local.diff. This fixes Bug fd.o bug #6642.
Fix buffer overflow in Render. (CVE 2006-1526). Patch by Eric Anholt.
Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-05-02 03:42:44 UTC (rev 2078)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-05-03 01:52:55 UTC (rev 2079)
@@ -1,8 +1,10 @@
-xorg-server (1:1.0.2-8) UNRELEASED; urgency=low
+xorg-server (1:1.0.2-8) unstable; urgency=low
* Move xserverrc back to xbase-clients. Thanks Benjamin Mesing.
+ * Add 15_security_allocate_local.diff. This fixes Bug fd.o bug #6642.
+ Fix buffer overflow in Render. (CVE 2006-1526). Patch by Eric Anholt.
- -- David Nusinow <dnusinow@debian.org> Thu, 27 Apr 2006 22:04:16 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 2 May 2006 21:47:17 -0400
xorg-server (1:1.0.2-7) unstable; urgency=low
Added: trunk/xserver/xorg-server-1.0.2/debian/patches/15_security_allocate_local.diff
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/15_security_allocate_local.diff 2006-05-02 03:42:44 UTC (rev 2078)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/15_security_allocate_local.diff 2006-05-03 01:52:55 UTC (rev 2079)
@@ -0,0 +1,36 @@
+Index: xorg-server-1.0.2/ChangeLog
+===================================================================
+--- xorg-server-1.0.2.orig/ChangeLog 2006-05-02 21:42:35.000000000 -0400
++++ xorg-server-1.0.2/ChangeLog 2006-05-02 21:45:05.000000000 -0400
+@@ -1,3 +1,9 @@
++2006-05-02 Adam Jackson <ajax@freedesktop.org>
++
++ * render/mitri.c:
++ Bug #6642: Fix buffer overflow in Render.
++ (CVE 2006-1526, patch from Eric Anholt)
++
+ 2006-03-20 Adam Jackson <ajax@freedesktop.org>
+
+ * hw/xfree86/common/xf86Init.c:
+Index: xorg-server-1.0.2/render/mitri.c
+===================================================================
+--- xorg-server-1.0.2.orig/render/mitri.c 2006-05-02 21:41:33.000000000 -0400
++++ xorg-server-1.0.2/render/mitri.c 2006-05-02 21:42:23.000000000 -0400
+@@ -145,7 +145,7 @@
+ if (npoint < 3)
+ return;
+ ntri = npoint - 2;
+- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
+ if (!tris)
+ return;
+ for (tri = tris; npoint >= 3; npoint--, points++, tri++)
+@@ -177,7 +177,7 @@
+ if (npoint < 3)
+ return;
+ ntri = npoint - 2;
+- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
+ if (!tris)
+ return;
+ first = points++;
Modified: trunk/xserver/xorg-server-1.0.2/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/series 2006-05-02 03:42:44 UTC (rev 2078)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/series 2006-05-03 01:52:55 UTC (rev 2079)
@@ -12,3 +12,4 @@
12_security_policy_in_etc.diff -p1
13_debian_add_xkbpath_env_variable.diff
14_debian_always_look_in_our_module_path.diff
+15_security_allocate_local.diff
Reply to: