projects / packages / gamin.git / blame
| Commit | Line | Data |
|---|---|---|
| 438b1545 ER |
1 | gam_server deadlocks, leading to all KDE applications hanging at start |
| 2 | https://bugzilla.redhat.com/show_bug.cgi?id=786170 | |
| 9c3eb84c | 3 | https://bugzilla.gnome.org/show_bug.cgi?id=667230 |
| 438b1545 ER |
4 | |
| 5 | Also happens to lock courier-imapd processes in pld linux | |
| 6 | ||
| 9c3eb84c ER |
7 | also |
| 8 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 | |
| 438b1545 | 9 | https://bugzilla.gnome.org/show_bug.cgi?id=669292 |
| 9c3eb84c ER |
10 | |
| 11 | From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001 | |
| 12 | From: Anssi Hannula <anssi@mageia.org> | |
| 13 | Date: Wed, 4 Jan 2012 00:23:55 +0200 | |
| 14 | Subject: [PATCH] fix possible server deadlock in ih_sub_cancel | |
| 15 | ||
| 16 | ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked. | |
| 17 | However, ih_sub_cancel() locks it again, and locking GMutex recursively | |
| 18 | causes undefined behaviour. | |
| 19 | ||
| 20 | Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach() | |
| 21 | is its only user. Also make the function static so that it won't | |
| 22 | accidentally get used by other files without locking (inotify-helper.h | |
| 23 | is an internal server header). | |
| 24 | ||
| 25 | This should fix the intermittent deadlocks I've been experiencing | |
| 26 | causing KDE applications to no longer start, and probably also | |
| 27 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 | |
| 438b1545 | 28 | --- |
| 9c3eb84c ER |
29 | server/inotify-helper.c | 7 ++----- |
| 30 | server/inotify-helper.h | 1 - | |
| 31 | 2 files changed, 2 insertions(+), 6 deletions(-) | |
| 438b1545 ER |
32 | |
| 33 | diff --git a/server/inotify-helper.c b/server/inotify-helper.c | |
| 9c3eb84c | 34 | index d77203e..0789fa4 100644 |
| 438b1545 ER |
35 | --- a/server/inotify-helper.c |
| 36 | +++ b/server/inotify-helper.c | |
| 9c3eb84c ER |
37 | @@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub) |
| 38 | ||
| 39 | /** | |
| 40 | * Cancels a subscription which was being monitored. | |
| 41 | + * inotify_lock must be held when calling. | |
| 42 | */ | |
| 43 | -gboolean | |
| 44 | +static gboolean | |
| 438b1545 ER |
45 | ih_sub_cancel (ih_sub_t * sub) |
| 46 | { | |
| 47 | - G_LOCK(inotify_lock); | |
| 48 | - | |
| 49 | - | |
| 50 | if (!sub->cancelled) | |
| 51 | { | |
| 52 | IH_W("cancelling %s\n", sub->pathname); | |
| 9c3eb84c | 53 | @@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub) |
| 438b1545 ER |
54 | sub_list = g_list_remove (sub_list, sub); |
| 55 | } | |
| 56 | ||
| 57 | - G_UNLOCK(inotify_lock); | |
| 58 | return TRUE; | |
| 59 | } | |
| 60 | ||
| 9c3eb84c ER |
61 | diff --git a/server/inotify-helper.h b/server/inotify-helper.h |
| 62 | index 5d3b6d0..d36b5fd 100644 | |
| 63 | --- a/server/inotify-helper.h | |
| 64 | +++ b/server/inotify-helper.h | |
| 65 | @@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb, | |
| 66 | found_callback_t fcb); | |
| 67 | gboolean ih_running (void); | |
| 68 | gboolean ih_sub_add (ih_sub_t *sub); | |
| 69 | -gboolean ih_sub_cancel (ih_sub_t *sub); | |
| 70 | ||
| 71 | /* Return FALSE from 'f' if the subscription should be cancelled */ | |
| 72 | void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata)); | |
| 438b1545 | 73 | -- |
| 9c3eb84c | 74 | 1.7.7.2 |
| 438b1545 | 75 |