xorg-server: Changes to 'debian-etch'
debian/changelog | 8 ++++++++
debian/patches/54_fb_asm_fix.diff | 28 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 37 insertions(+)
New commits:
commit 3239cfafbf1c9f8418a7ff1b3567b2bfb983f30d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 23 18:20:23 2008 +0100
Fix sigill on CPUs which don't support the cpuid instruction.
Add patch by Michael Karcher <karcher@physik.fu-berlin.de> to fix inline
asm in fb/fbpict.c. On processors without the cpuid instruction, the X
server would get a SIGILL (closes: #353494).
diff --git a/debian/changelog b/debian/changelog
index 5761156..fb61c8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.1.1-21etch4) UNRELEASED; urgency=low
+
+ * Add patch by Michael Karcher <karcher@physik.fu-berlin.de> to fix inline
+ asm in fb/fbpict.c. On processors without the cpuid instruction, the X
+ server would get a SIGILL (closes: #353494).
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 23 Jan 2008 18:13:52 +0100
+
xorg-server (2:1.1.1-21etch3) stable-security; urgency=high
* Add patch by Adam Jackson from Red Hat to fix regression introduced by the
diff --git a/debian/patches/54_fb_asm_fix.diff b/debian/patches/54_fb_asm_fix.diff
new file mode 100644
index 0000000..e09a832
--- /dev/null
+++ b/debian/patches/54_fb_asm_fix.diff
@@ -0,0 +1,28 @@
+Fix jumps to local labels in inline asm.
+This fixes a SIGILL on CPUs without the cpuid instruction
+Debian bug#353494
+
+This patch by Michael Karcher <karcher@physik.fu-berlin.de>
+
+Index: xorg-server/fb/fbpict.c
+===================================================================
+--- xorg-server.orig/fb/fbpict.c 2008-01-23 18:11:23.000000000 +0100
++++ xorg-server/fb/fbpict.c 2008-01-23 18:11:42.000000000 +0100
+@@ -1378,7 +1378,7 @@
+ "pop %%eax\n"
+ "mov $0x0, %%edx\n"
+ "xor %%ecx, %%eax\n"
+- "jz 1\n"
++ "jz 1f\n"
+
+ "mov $0x00000000, %%eax\n"
+ "push %%ebx\n"
+@@ -1422,7 +1422,7 @@
+ "cpuid\n"
+ "xor %%edx, %%edx\n"
+ "cmp $0x1, %%eax\n"
+- "jge 2\n"
++ "jge 2f\n"
+ "mov $0x80000001, %%eax\n"
+ "cpuid\n"
+ "2:\n"
diff --git a/debian/patches/series b/debian/patches/series
index 819e87d..755ab6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,3 +49,4 @@
51_CVE-2007-5760.diff
52_bug-13526.diff
53_CVE-2007-5958.diff
+54_fb_asm_fix.diff
Reply to: