|
 |
6bfc98 |
From f9c67a13af33f389429e4e760f2023a23a9ac19f Mon Sep 17 00:00:00 2001
|
|
|
6bfc98 |
From: Anssi Hannula <anssi@mageia.org>
|
|
|
6bfc98 |
Date: Wed, 4 Jan 2012 00:23:55 +0200
|
|
|
6bfc98 |
Subject: [PATCH 4/4] fix possible server deadlock in ih_sub_cancel
|
|
|
6bfc98 |
|
|
|
6bfc98 |
ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
|
|
|
6bfc98 |
However, ih_sub_cancel() locks it again, and locking GMutex recursively
|
|
|
6bfc98 |
causes undefined behaviour.
|
|
|
6bfc98 |
|
|
|
6bfc98 |
Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
|
|
|
6bfc98 |
is its only user. Also make the function static so that it won't
|
|
|
6bfc98 |
accidentally get used by other files without locking (inotify-helper.h
|
|
|
6bfc98 |
is an internal server header).
|
|
|
6bfc98 |
|
|
|
6bfc98 |
This should fix the intermittent deadlocks I've been experiencing
|
|
|
6bfc98 |
causing KDE applications to no longer start, and probably also
|
|
|
6bfc98 |
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
|
|
|
6bfc98 |
---
|
|
|
6bfc98 |
server/inotify-helper.c | 7 ++-----
|
|
|
6bfc98 |
server/inotify-helper.h | 1 -
|
|
|
6bfc98 |
2 files changed, 2 insertions(+), 6 deletions(-)
|
|
|
6bfc98 |
|
|
|
6bfc98 |
diff --git a/server/inotify-helper.c b/server/inotify-helper.c
|
|
|
6bfc98 |
index d77203e..0789fa4 100644
|
|
|
6bfc98 |
--- a/server/inotify-helper.c
|
|
|
6bfc98 |
+++ b/server/inotify-helper.c
|
|
|
6bfc98 |
@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
|
|
|
6bfc98 |
|
|
|
6bfc98 |
/**
|
|
|
6bfc98 |
* Cancels a subscription which was being monitored.
|
|
|
6bfc98 |
+ * inotify_lock must be held when calling.
|
|
|
6bfc98 |
*/
|
|
|
6bfc98 |
-gboolean
|
|
|
6bfc98 |
+static gboolean
|
|
|
6bfc98 |
ih_sub_cancel (ih_sub_t * sub)
|
|
|
6bfc98 |
{
|
|
|
6bfc98 |
- G_LOCK(inotify_lock);
|
|
|
6bfc98 |
-
|
|
|
6bfc98 |
-
|
|
|
6bfc98 |
if (!sub->cancelled)
|
|
|
6bfc98 |
{
|
|
|
6bfc98 |
IH_W("cancelling %s\n", sub->pathname);
|
|
|
6bfc98 |
@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
|
|
|
6bfc98 |
sub_list = g_list_remove (sub_list, sub);
|
|
|
6bfc98 |
}
|
|
|
6bfc98 |
|
|
|
6bfc98 |
- G_UNLOCK(inotify_lock);
|
|
|
6bfc98 |
return TRUE;
|
|
|
6bfc98 |
}
|
|
|
6bfc98 |
|
|
|
6bfc98 |
diff --git a/server/inotify-helper.h b/server/inotify-helper.h
|
|
|
6bfc98 |
index 5d3b6d0..d36b5fd 100644
|
|
|
6bfc98 |
--- a/server/inotify-helper.h
|
|
|
6bfc98 |
+++ b/server/inotify-helper.h
|
|
|
6bfc98 |
@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb,
|
|
|
6bfc98 |
found_callback_t fcb);
|
|
|
6bfc98 |
gboolean ih_running (void);
|
|
|
6bfc98 |
gboolean ih_sub_add (ih_sub_t *sub);
|
|
|
6bfc98 |
-gboolean ih_sub_cancel (ih_sub_t *sub);
|
|
|
6bfc98 |
|
|
|
6bfc98 |
/* Return FALSE from 'f' if the subscription should be cancelled */
|
|
|
6bfc98 |
void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
|
|
|
6bfc98 |
--
|
|
|
6bfc98 |
2.5.0
|
|
|
6bfc98 |
|