aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2013-03-19 17:16:14 +0100
committerMiklos Szeredi <mszeredi@suse.cz>2013-03-19 17:16:14 +0100
commit44088bc7fbe7c9234c090756dbf10742b1a281b1 (patch)
treeacaeb43a0eff6a826efd3ef5bcdf2b0b6881f3fa /lib
parent22d0d4275a693968eafed42a1656695fcddcea01 (diff)
downloadandroid_external_fuse-44088bc7fbe7c9234c090756dbf10742b1a281b1.tar.gz
android_external_fuse-44088bc7fbe7c9234c090756dbf10742b1a281b1.tar.bz2
android_external_fuse-44088bc7fbe7c9234c090756dbf10742b1a281b1.zip
libfuse: fix thread cancel race
Exiting a worker my race with cancelling that same worker. This caused a segmenation fault. Reported and tested by Anatol Pomozov
Diffstat (limited to 'lib')
-rw-r--r--lib/fuse_loop_mt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c
index 7ae5890..82e3001 100644
--- a/lib/fuse_loop_mt.c
+++ b/lib/fuse_loop_mt.c
@@ -241,9 +241,11 @@ int fuse_session_loop_mt(struct fuse_session *se)
while (!fuse_session_exited(se))
sem_wait(&mt.finish);
+ pthread_mutex_lock(&mt.lock);
for (w = mt.main.next; w != &mt.main; w = w->next)
pthread_cancel(w->thread_id);
mt.exit = 1;
+ pthread_mutex_unlock(&mt.lock);
while (mt.main.next != &mt.main)
fuse_join_worker(&mt, mt.main.next);