diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-31 12:11:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-31 12:11:32 -0700 |
commit | 035f0cd3f8d86db900cde083d8ed8a7b0ce1221a (patch) | |
tree | 487dd2abfba97144474092fa70e79bd31c5e7c57 /crypto/fips.c | |
parent | 728f4b3aa6621aba12e9f9c2f006f2912a90463a (diff) | |
parent | 9df0eb180c2074451f25556eb566d89c7057c2ac (diff) | |
download | linux-035f0cd3f8d86db900cde083d8ed8a7b0ce1221a.tar.bz2 |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
- memory corruption when kmalloc fails in xts/lrw
- mark some CCP DMA channels as private
- fix reordering race in padata
- regression in omap-rng DT description"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: xts,lrw - fix out-of-bounds write after kmalloc failure
crypto: ccp - Make some CCP DMA channels private
padata: avoid race in reordering
dt-bindings: rng: clocks property on omap_rng not always mandatory
Diffstat (limited to 'crypto/fips.c')
0 files changed, 0 insertions, 0 deletions