summaryrefslogtreecommitdiff
path: root/fs/ecryptfs/keystore.c
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2013-02-12 21:56:54 +0400
committerTyler Hicks <tyhicks@canonical.com>2013-02-12 22:06:01 +0400
commit3a46741804a4226cd837d1246eed95d4161f7159 (patch)
tree85e2fcbcc0a3a8b05e081c083da347ba2dcfdd72 /fs/ecryptfs/keystore.c
parenta07c48ad5be5cbf32a2741f10e6fbf4bbfcaa362 (diff)
downloadlinux-3a46741804a4226cd837d1246eed95d4161f7159.tar.xz
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>
Diffstat (limited to 'fs/ecryptfs/keystore.c')
-rw-r--r--fs/ecryptfs/keystore.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 6154cde3a052..5aceff202dc0 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;
}