Commit 49fe9bcc authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - Crash in caam hash due to uninitialised buffer lengths.

   - Alignment issue in caam RNG that may lead to non-random output"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix RNG buffer cache alignment
  crypto: caam - improve initalization for context state saves
parents 66fc1303 412c98c1
...@@ -1544,6 +1544,8 @@ static int ahash_init(struct ahash_request *req) ...@@ -1544,6 +1544,8 @@ static int ahash_init(struct ahash_request *req)
state->current_buf = 0; state->current_buf = 0;
state->buf_dma = 0; state->buf_dma = 0;
state->buflen_0 = 0;
state->buflen_1 = 0;
return 0; return 0;
} }
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
/* Buffer, its dma address and lock */ /* Buffer, its dma address and lock */
struct buf_data { struct buf_data {
u8 buf[RN_BUF_SIZE]; u8 buf[RN_BUF_SIZE] ____cacheline_aligned;
dma_addr_t addr; dma_addr_t addr;
struct completion filled; struct completion filled;
u32 hw_desc[DESC_JOB_O_LEN]; u32 hw_desc[DESC_JOB_O_LEN];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment