diff options
author | Tyler Hicks <tyhicks@canonical.com> | 2013-02-27 14:37:48 -0500 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2013-02-27 14:41:18 -0500 |
commit | 1111eae90fb64a9d9ed133e410712f1e34fdce4a (patch) | |
tree | 6a98de6920ac6eb7e92d076edb3265bfc931be72 /fs | |
parent | 1101d58669a92ed9c9f4c7281404fb1e067a1e28 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ecryptfs/messaging.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
283 | int rc; | 283 | int rc; |
284 | 284 | ||
285 | rc = ecryptfs_find_daemon_by_euid(&daemon); | 285 | rc = ecryptfs_find_daemon_by_euid(&daemon); |
286 | if (rc || !daemon) { | 286 | if (rc) { |
287 | rc = -ENOTCONN; | 287 | rc = -ENOTCONN; |
288 | goto out; | 288 | goto out; |
289 | } | 289 | } |