Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f14d85 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Linus Torvalds
Browse files

eCryptFS: fix imbalanced mutex locking 

Fix imbalanced calls for mutex lock/unlock on ecryptfs_daemon_hash_mux
Revealed by Ingo Molnar: http://lkml.org/lkml/2008/5/7/260



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d850a2fa

fs/ecryptfs/miscdev.c

+2 −0
Original line number Diff line number Diff line
@@ -257,12 +257,14 @@ ecryptfs_miscdev_read(struct file *file, char __user *buf, size_t count, 
	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 */