From: Tyler Hicks <tyhicks@canonical.com>
Date: Wed, 27 Feb 2013 19:37:48 +0000 (-0800)
Subject: eCryptfs: Fix redundant error check on ecryptfs_find_daemon_by_euid()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1111eae90fb64a9d9ed133e410712f1e34fdce4a;p=linux-beck.git

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>
---

diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index d5c7297c5816..474051bd8d92 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -283,7 +283,7 @@ ecryptfs_send_message_locked(char *data, int data_len, u8 msg_type,
 	int rc;
 
 	rc = ecryptfs_find_daemon_by_euid(&daemon);
-	if (rc || !daemon) {
+	if (rc) {
 		rc = -ENOTCONN;
 		goto out;
 	}