rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / fs / ecryptfs / keystore.c

diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 4725a07f003cf3279fa81813748442afc24a053c..7d52806c21197206a5932b08a68e7dc9d6899253 100644 (file)
--- 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 = NULL;
+       char *payload;
        size_t payload_len = 0;
        int rc;
 
@@ -1203,7 +1203,6 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
        }
 out:
        kfree(msg);
-       kfree(payload);
        return rc;
 }