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 | 732fa3218aa99f9184ce5e81ee43689cf78010ca (patch) | |
| tree | 8c207c60f5043c5c492011f2d5da37f93a062959 /crypto/asymmetric_keys/x509_parser.h | |
| parent | f27596611714bbcd2e2459974f9713106cf0f351 (diff) | |
| parent | 7850b58ce111818befca6f2975adb7c559caa461 (diff) | |
| download | linux-crypto-732fa3218aa99f9184ce5e81ee43689cf78010ca.tar.gz linux-crypto-732fa3218aa99f9184ce5e81ee43689cf78010ca.zip | |
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/asymmetric_keys/x509_parser.h')
0 files changed, 0 insertions, 0 deletions