1 files changed, 4 insertions, 5 deletions

diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 2333203a120b..7d52806c2119 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -1150,7 +1150,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
         struct ecryptfs_message *msg = NULL;
         char *auth_tok_sig;
         char *payload;
-        size_t payload_len;
+        size_t payload_len = 0;
         int rc;
 
         rc = ecryptfs_get_auth_tok_sig(&auth_tok_sig, auth_tok);
@@ -1168,7 +1168,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
         rc = ecryptfs_send_message(payload, payload_len, &msg_ctx);
         if (rc) {
                 ecryptfs_printk(KERN_ERR, "Error sending message to "
-                                "ecryptfsd\n");
+                                "ecryptfsd: %d\n", rc);
                 goto out;
         }
         rc = ecryptfs_wait_for_response(msg_ctx, &msg);
@@ -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;
 }
 
@@ -1989,7 +1988,7 @@ pki_encrypt_session_key(struct key *auth_tok_key,
         rc = ecryptfs_send_message(payload, payload_len, &msg_ctx);
         if (rc) {
                 ecryptfs_printk(KERN_ERR, "Error sending message to "
-                                "ecryptfsd\n");
+                                "ecryptfsd: %d\n", rc);
                 goto out;
         }
         rc = ecryptfs_wait_for_response(msg_ctx, &msg);