diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-07 22:07:10 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-07 22:07:10 +0100 |
commit | 52ab2ec00518a164884c5670932557cd868b0193 (patch) | |
tree | 95e821540e945a1dfc1ab55dc3b5015eefb15d64 /scripts | |
parent | Merge tag 'pci-v4.20-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | crypto: user - Disable statistics interface (diff) | |
download | linux-52ab2ec00518a164884c5670932557cd868b0193.tar.xz linux-52ab2ec00518a164884c5670932557cd868b0193.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- Disable the new crypto stats interface as it's still being changed
- Fix potential uses-after-free in cbc/cfb/pcbc.
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: user - Disable statistics interface
crypto: do not free algorithm before using
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions