Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2018 17:02:44 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2018 17:02:44 +0000 (10:02 -0700)
commit6e041ffcc2d0bf8792937e89480b2172a9dd2823
tree60bc2ee16c276c10dcb28592a1bc58daf5c9655f
parentcac264288abe0f54b91e51d97c949b706c9435c7
parenteea0d3ea7546961f69f55b26714ac8fd71c7c020
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:

 - crypto API regression that may cause sporadic alloc failures

 - double-free bug in drbg

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: drbg - set freed buffers to NULL
  crypto: api - fix finding algorithm currently being tested