File autofs-5.0.5-fix-out-of-order-locking-in-readma... of Package autofs

Overview Repositories Revisions Requests Users Attributes Meta

File autofs-5.0.5-fix-out-of-order-locking-in-readmap.patch of Package autofs (Revision 6348ac4e0c328a3a3d942faa1e226d6b)

Currently displaying revision 6348ac4e0c328a3a3d942faa1e226d6b , Show latest

autofs-5.0.5 - fix out of order locking in readmap

From: Ian Kent <raven@themaw.net>

When re-reading the master map and a mount lookup for a particular map
entry arrives at the same time a map source is being added to the map
entry and a map entry re-read is also initiated at the same time an
out of order mutex locking bug which results in a hang.
---

CHANGELOG    |    1 +
 lib/master.c |    8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

Index: autofs-5.0.5/lib/master.c
===================================================================
--- autofs-5.0.5.orig/lib/master.c
+++ autofs-5.0.5/lib/master.c
@@ -624,8 +624,6 @@ struct master_mapent *master_find_mapent
 {
 	struct list_head *head, *p;
 
-	master_mutex_lock();
-
 	head = &master->mounts;
 	list_for_each(p, head) {
 		struct master_mapent *entry;
@@ -638,8 +636,6 @@ struct master_mapent *master_find_mapent
 		}
 	}
 
-	master_mutex_unlock();
-
 	return NULL;
 }
 
@@ -716,9 +712,7 @@ struct master_mapent *master_new_mapent(
 
 void master_add_mapent(struct master *master, struct master_mapent *entry)
 {
-	master_mutex_lock();
 	list_add_tail(&entry->list, &master->mounts);
-	master_mutex_unlock();
 	return;
 }
 
@@ -826,6 +820,7 @@ int master_read_master(struct master *ma
 	 * We need to clear and re-populate the null map entry cache
 	 * before alowing anyone else to use it.
 	 */
+	master_mutex_lock();
 	if (master->nc) {
 		cache_writelock(master->nc);
 		nc = master->nc;
@@ -844,6 +839,7 @@ int master_read_master(struct master *ma
 	master_init_scan();
 	lookup_nss_read_master(master, age);
 	cache_unlock(nc);
+	master_mutex_unlock();
 
 	if (!master->read_fail)
 		master_mount_mounts(master, age, readall);
Index: autofs-5.0.5/CHANGELOG
===================================================================
--- autofs-5.0.5.orig/CHANGELOG
+++ autofs-5.0.5/CHANGELOG
@@ -64,6 +64,7 @@
 - replace GPLv3 code.
 - fix next task list update.
 - fix stale map read.
+- fix out of order locking in readmap.
 
 03/09/2009 autofs-5.0.5
 -----------------------

Places

File autofs-5.0.5-fix-out-of-order-locking-in-readmap.patch of Package autofs (Revision 6348ac4e0c328a3a3d942faa1e226d6b)

Places