From 9de186c96d461b373f34aa275aafe8c9cc93fa7d Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 12 Feb 2013 10:56:54 -0700
Subject: [PATCH] --- yaml --- r: 360854 b: refs/heads/master c:
 3a46741804a4226cd837d1246eed95d4161f7159 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/ecryptfs/keystore.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8e7cd3dab36d..e765c96d6b74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a07c48ad5be5cbf32a2741f10e6fbf4bbfcaa362
+refs/heads/master: 3a46741804a4226cd837d1246eed95d4161f7159
diff --git a/trunk/fs/ecryptfs/keystore.c b/trunk/fs/ecryptfs/keystore.c
index 6154cde3a052..5aceff202dc0 100644
--- a/trunk/fs/ecryptfs/keystore.c
+++ b/trunk/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;
 }