Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 May 2017 04:30:20 +0000 (21:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 May 2017 04:30:20 +0000 (21:30 -0700)
commitfde8e33d106846b081b0e6cd5e283af7146eb7e4
tree94196ebdc467cdc7687db05098e49b0d6ad875eb
parentfadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5
parent9933e113c2e87a9f46a40fde8dafbf801dca1ab9
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a regression in the skcipher interface that allows bogus
  key parameters to hit underlying implementations which can cause
  crashes"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - Add missing API setkey checks