Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse source

Pull crypto fixes from Herbert Xu:
 "This fixes a NULL pointer dereference on allocation failure in caam,
  as well as a regression in the ctr mode on s390 that was added with
  the recent concurrency fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: s390 - fix aes,des ctr mode concurrency finding.
  crypto: caam - add allocation failure handling in SPRINTFCAT macro

...

This commit is contained in:

Linus Torvalds 2014-05-21 18:34:35 +09:00

parent a7aa96a92e 3901c1124e

commit 1f5518b4e7

3 changed files with 13 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/s390/crypto/aes_s390.c

View file

3

arch/s390/crypto/des_s390.c

View file

10

drivers/crypto/caam/error.c

View file