tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 49fe9bcc 66fc1303

+3 -1
+2
drivers/crypto/caam/caamhash.c
··· 1544 1544 1545 1545 state->current_buf = 0; 1546 1546 state->buf_dma = 0; 1547 + state->buflen_0 = 0; 1548 + state->buflen_1 = 0; 1547 1549 1548 1550 return 0; 1549 1551 }
+1 -1
drivers/crypto/caam/caamrng.c
··· 56 56 57 57 /* Buffer, its dma address and lock */ 58 58 struct buf_data { 59 - u8 buf[RN_BUF_SIZE]; 59 + u8 buf[RN_BUF_SIZE] ____cacheline_aligned; 60 60 dma_addr_t addr; 61 61 struct completion filled; 62 62 u32 hw_desc[DESC_JOB_O_LEN];