Author: branden
Date: 2004-12-20 04:25:59 -0500 (Mon, 20 Dec 2004)
New Revision: 2102
Added:
trunk/debian/patches/099o_ati_radeon_fix_SEGV_in_display_query.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
Apply patch from Bjorn Helgaas to fix SEGV in ati/radeon driver that
occurs when RADEONQueryConnectedDisplays() calls vbeDoEDID() but the
latter function returns NULL. Thanks, Bjorn! (Closes: #284025)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-12-20 04:01:46 UTC (rev 2101)
+++ trunk/debian/CHANGESETS 2004-12-20 09:25:59 UTC (rev 2102)
@@ -43,4 +43,9 @@
(Closes: #279252)
2101
+Apply patch from Bjorn Helgaas to fix SEGV in ati/radeon driver that
+occurs when RADEONQueryConnectedDisplays() calls vbeDoEDID() but the
+latter function returns NULL. Thanks, Bjorn! (Closes: #284025)
+ 2102
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-12-20 04:01:46 UTC (rev 2101)
+++ trunk/debian/changelog 2004-12-20 09:25:59 UTC (rev 2102)
@@ -33,8 +33,12 @@
Deregister lxterm as an alternative when the package is removed.
(Closes: #279252)
- -- Branden Robinson <[EMAIL PROTECTED]> Sun, 19 Dec 2004 22:59:02 -0500
+ * Apply patch from Bjorn Helgaas to fix SEGV in ati/radeon driver that
+ occurs when RADEONQueryConnectedDisplays() calls vbeDoEDID() but the
+ latter function returns NULL. Thanks, Bjorn! (Closes: #284025)
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 20 Dec 2004 04:24:22 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Added: trunk/debian/patches/099o_ati_radeon_fix_SEGV_in_display_query.diff
===================================================================
--- trunk/debian/patches/099o_ati_radeon_fix_SEGV_in_display_query.diff
2004-12-20 04:01:46 UTC (rev 2101)
+++ trunk/debian/patches/099o_ati_radeon_fix_SEGV_in_display_query.diff
2004-12-20 09:25:59 UTC (rev 2102)
@@ -0,0 +1,24 @@
+$Id$
+
+The radeon driver can SEGV in RADEONQueryConnectedDisplays(). See Debian
+#284025.
+
+Analysis and patch by Bjorn Helgaas:
+
+ "The problem is pretty clear from the source. We call vbeDoEDID(), which
+ usually returns a pointer, but can return NULL for failure. Then we
+ dereference it without bothering to check for NULL."
+
+Not submitted to XFree86.
+
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig
2004-11-30 13:59:17.314008332 -0700
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-11-30
14:00:14.328656071 -0700
+@@ -1272,7 +1272,7 @@
+ for (i = 0; i < 5; i++) {
+ pRADEONEnt->MonInfo1 = vbeDoEDID(pVbe, NULL);
+ }
+- if (pRADEONEnt->MonInfo1->rawData[0x14] & 0x80)
++ if (pRADEONEnt->MonInfo1 &&
pRADEONEnt->MonInfo1->rawData[0x14] & 0x80)
+ pRADEONEnt->MonType1 = MT_DFP;
+ else pRADEONEnt->MonType1 = MT_CRT;
+ }
Property changes on:
trunk/debian/patches/099o_ati_radeon_fix_SEGV_in_display_query.diff
___________________________________________________________________
Name: svn:keywords
+ Id
