Crypto Fixes for 3.15

Herbert Xu
2014-05-21T12:22:26Z

Hi Linus:

This push 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.

Please pull from

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

or

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

Harald Freudenberger (1):
crypto: s390 - fix aes,des ctr mode concurrency finding.

Horia Geanta (1):
crypto: caam - add allocation failure handling in SPRINTFCAT macro

arch/s390/crypto/aes_s390.c | 3 +++
arch/s390/crypto/des_s390.c | 3 +++
drivers/crypto/caam/error.c | 10 +++++++---
3 files changed, 13 insertions(+), 3 deletions(-)