diff options
author | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
---|---|---|
committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
commit | 4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch) | |
tree | db2b279c1ef40e8170883efd1c0bd118d1803aec /fs/ecryptfs/keystore.c | |
parent | b153532021104be5cc1abc3b6b60c004739b31c7 (diff) | |
parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) |
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
Diffstat (limited to 'fs/ecryptfs/keystore.c')
-rw-r--r-- | fs/ecryptfs/keystore.c | 3 |
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; } |