mm, page_alloc: use unlikely() in task_capc()

[linux-2.6-microblaze.git] / fs / ecryptfs / keystore.c

diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index af3eb02..f6a17d2 100644 (file)
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -838,7 +838,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
 out_release_free_unlock:
        crypto_free_shash(s->hash_tfm);
 out_free_unlock:
-       kzfree(s->block_aligned_filename);
+       kfree_sensitive(s->block_aligned_filename);
 out_unlock:
        mutex_unlock(s->tfm_mutex);
 out:
@@ -847,7 +847,7 @@ out:
                key_put(auth_tok_key);
        }
        skcipher_request_free(s->skcipher_req);
-       kzfree(s->hash_desc);
+       kfree_sensitive(s->hash_desc);
        kfree(s);
        return rc;
 }