From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 12 Feb 2013 17:56:54 +0000 (-0700)
Subject: eCryptfs: decrypt_pki_encrypted_session_key(): remove kfree() redundant null check
X-Git-Tag: v3.9-rc2~20^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a46741804a4226cd837d1246eed95d4161f7159;p=thirdparty%2Fkernel%2Flinux.git

eCryptfs: decrypt_pki_encrypted_session_key(): remove kfree() redundant null check

smatch analysis:

fs/ecryptfs/keystore.c:1206 decrypt_pki_encrypted_session_key() info:
 redundant null check on msg calling kfree()

Cc: Dustin Kirkland <dustin.kirkland@gazzang.com>
Cc: ecryptfs@vger.kernel.org
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---

diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 6154cde3a052b..5aceff202dc01 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -1202,8 +1202,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
 				  crypt_stat->key_size);
 	}
 out:
-	if (msg)
-		kfree(msg);
+	kfree(msg);
 	return rc;
 }