commit 1111eae90fb64a9d9ed133e410712f1e34fdce4a
author Tyler Hicks <tyhicks@canonical.com> Wed Feb 27 11:37:48 2013 -0800
committer Tyler Hicks <tyhicks@canonical.com> Wed Feb 27 11:41:18 2013 -0800
tree 6a98de6920ac6eb7e92d076edb3265bfc931be72
parent 1101d58669a92ed9c9f4c7281404fb1e067a1e28

eCryptfs: Fix redundant error check on ecryptfs_find_daemon_by_euid()

It is sufficient to check the return code of
ecryptfs_find_daemon_by_euid(). If it returns 0, it always sets the
daemon pointer to point to a valid ecryptfs_daemon.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reported-by: Kees Cook <keescook@chromium.org>

fs/ecryptfs/messaging.c

diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index d5c7297..474051b 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -283,7 +283,7 @@
 	int rc;
 
 	rc = ecryptfs_find_daemon_by_euid(&daemon);
-	if (rc || !daemon) {
+	if (rc) {
 		rc = -ENOTCONN;
 		goto out;
 	}