| commit | 52ab2ec00518a164884c5670932557cd868b0193 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 07 13:07:10 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 07 13:07:10 2018 -0800 |
| tree | 95e821540e945a1dfc1ab55dc3b5015eefb15d64 | |
| parent | 7b24f6c082b3777749ccd19c9beb8643fa718480 [diff] | |
| parent | e61efff4ae94f4509707a5e03f8edb6455f490e1 [diff] |
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