eCryptFS: fix imbalanced mutex locking

PATCH New Cyrill Gorcunov 1 participant 1 message May 10, 2008 Ecrypt file system

lore

Share & tools

lore

Cyrill Gorcunov

author

2008-05-10 08:45 UTC #0 lore raw

PATCH 1/1 eCryptFS: fix imbalanced mutex locking

Fix imbalanced calls for mutex lock/unlock on ecryptfs_daemon_hash_mux

Signed-off-by Cyrill Gorcunov <[email protected]>

---

Revealed by Ingo Molnar: http://lkml.org/lkml/2008/5/7/260

Please test and rewview

fs/ecryptfs/miscdev.c +2 -0

Index: linux-2.6.git/fs/ecryptfs/miscdev.c
===================================================================
@@ -257,12 +257,14 @@ ecryptfs_miscdev_read(struct file *file,
 	mutex_lock(&daemon->mux);
 	if (daemon->flags & ECRYPTFS_DAEMON_ZOMBIE) {
 		rc = 0;
+		mutex_unlock(&ecryptfs_daemon_hash_mux);
 		printk(KERN_WARNING "%s: Attempt to read from zombified "
 		       "daemon\n", __func__);
 		goto out_unlock_daemon;
 	}
 	if (daemon->flags & ECRYPTFS_DAEMON_IN_READ) {
 		rc = 0;
+		mutex_unlock(&ecryptfs_daemon_hash_mux);
 		goto out_unlock_daemon;
 	}
 	/* This daemon will not go away so long as this flag is set */