aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorGeyslan G. Bem <geyslan@gmail.com>2013-10-11 16:49:16 -0300
committerTyler Hicks <tyhicks@canonical.com>2013-10-16 15:18:01 -0700
commit3edc8376c06133e3386265a824869cad03a4efd4 (patch)
tree285056122ff468ba24472764e76ef8633874e6d2 /fs
parentd6099aeb4a9aad5e7ab1c72eb119ebd52dee0d52 (diff)
downloadlinux-3edc8376c06133e3386265a824869cad03a4efd4.tar.gz
ecryptfs: Fix memory leakage in keystore.c
In 'decrypt_pki_encrypted_session_key' function: Initializes 'payload' pointer and releases it on exit. Signed-off-by: Geyslan G. Bem <geyslan@gmail.com> Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Cc: stable@vger.kernel.org # v2.6.28+
Diffstat (limited to 'fs')
-rw-r--r--fs/ecryptfs/keystore.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 7d52806c2119..4725a07f003c 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -1149,7 +1149,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
struct ecryptfs_msg_ctx *msg_ctx;
struct ecryptfs_message *msg = NULL;
char *auth_tok_sig;
- char *payload;
+ char *payload = NULL;
size_t payload_len = 0;
int rc;
@@ -1203,6 +1203,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
}
out:
kfree(msg);
+ kfree(payload);
return rc;
}