Other unresolved patches Ubuntu is following

[Keith Packard]

Bryce Harrington <bryce at canonical.com> writes:

> 1.  208_switch_on_release.diff
>   * https://bugs.freedesktop.org/show_bug.cgi?id=865
>   * http://lists.freedesktop.org/archives/xorg-devel/2013-January/035046.html
>
>   The original proposed patch broke the XKB spec, which I guess is why
>   it was not accepted.  However, an alternate version was recently
>   proposed last month.  We're hoping that resolves to a solution, that
>   can replace the patch we're currently carrying.

This is a feature request and so isn't suitable for 1.14. For 1.15, this
would need all of the XKB version fixes, both server and client side.

> 2.  227_null_ptr_midispcur.patch
>   * https://bugs.launchpad.net/xorg-server/+bug/930936
>   * Possibly dupe of https://bugs.freedesktop.org/show_bug.cgi?id=24181
>
>   I think this just papers over a deeper problem so probably isn't a
>   candidate for upstreaming, but it did resolve the recurring crash
>   problem for the user, so we're carrying it in Ubuntu.  I haven't
>   reproduced the bug myself, but maybe the patch offers some clue.

This looks useful, obviously root causing would be nice. In any case,
this should be fixed for 1.14, but it can be applied after the
non-critical window is closed.

> 3.  233-xf86events-valgrind.patch
>   * http://patchwork.freedesktop.org/patch/12156/
>
>   Fixes a valgrind error we ran into.  The review comments suggest doing
>   a more extensive code refactoring, but given it's been a few months
>   maybe that's more than the patch author is prepared to do for now.

Aaron had an improvement which I've taken the liberty of turning into a
complete patch. I'd like an ack or Rb on this if possible.

commit 539fec1b3eae47fa78a691fed455b5d07444c302
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Feb 11 14:31:56 2013 -0800

    xf86: use nt_list_for_each_entry_safe to walk InputHandlers in xf86Wakeup
    
    This is necessary when the input handler deletes itself from the
    list. Bug found by Maarten Lankhorst, this patch uses the list macros
    instead of open-coding the fix.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 377e936..d92174e 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -272,9 +272,9 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
     }
 
     if (err >= 0) {             /* we don't want the handlers called if select() */
-        IHPtr ih;               /* returned with an error condition, do we?      */
+        IHPtr ih, ih_tmp;       /* returned with an error condition, do we?      */
 
-        for (ih = InputHandlers; ih; ih = ih->next) {
+        nt_list_for_each_entry_safe(ih, ih_tmp, InputHandlers, next) {
             if (ih->enabled && ih->fd >= 0 && ih->ihproc &&
                 (FD_ISSET(ih->fd, ((fd_set *) pReadmask)) != 0)) {
                 ih->ihproc(ih->fd, ih->data);

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20130211/2c3380eb/attachment.pgp>