UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2015-06-17 20:49:26 -10:00
parent 66fc130394 412c98c1be
commit 49fe9bcc50
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/caam/caamhash.c
View File

@ -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;
} }

2
drivers/crypto/caam/caamrng.c
View File

@ -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];