Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/gamin/patches/gamin-0.1.10-fix-possible-server-deadlock-in-ih_sub_cancel.patch

    Contents of /trunk/gamin/patches/gamin-0.1.10-fix-possible-server-deadlock-in-ih_sub_cancel.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3261 - (show annotations) (download)
    Mon Dec 3 08:19:53 2018 UTC (5 years, 5 months ago) by niro
    File size: 2086 byte(s) 
    -added deadlock patch
    1 From f9c67a13af33f389429e4e760f2023a23a9ac19f Mon Sep 17 00:00:00 2001
    2 From: Anssi Hannula <anssi@mageia.org>
    3 Date: Wed, 4 Jan 2012 00:23:55 +0200
    4 Subject: [PATCH 4/4] fix possible server deadlock in ih_sub_cancel
    5
    6 ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
    7 However, ih_sub_cancel() locks it again, and locking GMutex recursively
    8 causes undefined behaviour.
    9
    10 Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
    11 is its only user. Also make the function static so that it won't
    12 accidentally get used by other files without locking (inotify-helper.h
    13 is an internal server header).
    14
    15 This should fix the intermittent deadlocks I've been experiencing
    16 causing KDE applications to no longer start, and probably also
    17 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
    18 ---
    19 server/inotify-helper.c | 7 ++-----
    20 server/inotify-helper.h | 1 -
    21 2 files changed, 2 insertions(+), 6 deletions(-)
    22
    23 diff --git a/server/inotify-helper.c b/server/inotify-helper.c
    24 index d77203e..0789fa4 100644
    25 --- a/server/inotify-helper.c
    26 +++ b/server/inotify-helper.c
    27 @@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
    28
    29 /**
    30 * Cancels a subscription which was being monitored.
    31 + * inotify_lock must be held when calling.
    32 */
    33 -gboolean
    34 +static gboolean
    35 ih_sub_cancel (ih_sub_t * sub)
    36 {
    37 - G_LOCK(inotify_lock);
    38 -
    39 -
    40 if (!sub->cancelled)
    41 {
    42 IH_W("cancelling %s\n", sub->pathname);
    43 @@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
    44 sub_list = g_list_remove (sub_list, sub);
    45 }
    46
    47 - G_UNLOCK(inotify_lock);
    48 return TRUE;
    49 }
    50
    51 diff --git a/server/inotify-helper.h b/server/inotify-helper.h
    52 index 5d3b6d0..d36b5fd 100644
    53 --- a/server/inotify-helper.h
    54 +++ b/server/inotify-helper.h
    55 @@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb,
    56 found_callback_t fcb);
    57 gboolean ih_running (void);
    58 gboolean ih_sub_add (ih_sub_t *sub);
    59 -gboolean ih_sub_cancel (ih_sub_t *sub);
    60
    61 /* Return FALSE from 'f' if the subscription should be cancelled */
    62 void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
    63 --
    64 2.5.0
    65