From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 May 2017 04:30:20 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: MMI-PSA29.97-13-9~5543
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fde8e33d106846b081b0e6cd5e283af7146eb7e4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

fde8e33d106846b081b0e6cd5e283af7146eb7e4