From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Dec 2016 21:31:29 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.14-rc1~1888
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f1d6dfe03ca4e36132221b918499c6f0b0f048d;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 4.10:

  API:
   - add skcipher walk interface
   - add asynchronous compression (acomp) interface
   - fix algif_aed AIO handling of zero buffer

  Algorithms:
   - fix unaligned access in poly1305
   - fix DRBG output to large buffers

  Drivers:
   - add support for iMX6UL to caam
   - fix givenc descriptors (used by IPsec) in caam
   - accelerated SHA256/SHA512 for ARM64 from OpenSSL
   - add SSE CRCT10DIF and CRC32 to ARM/ARM64
   - add AEAD support to Chelsio chcr
   - add Armada 8K support to omap-rng"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (148 commits)
  crypto: testmgr - fix overlap in chunked tests again
  crypto: arm/crc32 - accelerated support based on x86 SSE implementation
  crypto: arm64/crc32 - accelerated support based on x86 SSE implementation
  crypto: arm/crct10dif - port x86 SSE implementation to ARM
  crypto: arm64/crct10dif - port x86 SSE implementation to arm64
  crypto: testmgr - add/enhance test cases for CRC-T10DIF
  crypto: testmgr - avoid overlap in chunked tests
  crypto: chcr - checking for IS_ERR() instead of NULL
  crypto: caam - check caam_emi_slow instead of re-lookup platform
  crypto: algif_aead - fix AIO handling of zero buffer
  crypto: aes-ce - Make aes_simd_algs static
  crypto: algif_skcipher - set error code when kcalloc fails
  crypto: caam - make aamalg_desc a proper module
  crypto: caam - pass key buffers with typesafe pointers
  crypto: arm64/aes-ce-ccm - Fix AEAD decryption length
  MAINTAINERS: add crypto headers to crypto entry
  crypt: doc - remove misleading mention of async API
  crypto: doc - fix header file name
  crypto: api - fix comment typo
  crypto: skcipher - Add separate walker for AEAD decryption
  ..
---

0f1d6dfe03ca4e36132221b918499c6f0b0f048d
diff --cc crypto/algif_aead.c
index 235f54d,6e95137..668ef40
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@@ -451,10 -445,11 +451,11 @@@ static int aead_recvmsg_async(struct so
  	aead_request_set_ad(req, ctx->aead_assoclen);
  	aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
  				  aead_async_cb, sk);
 -	used -= ctx->aead_assoclen + (ctx->enc ? as : 0);
 +	used -= ctx->aead_assoclen;
  
  	/* take over all tx sgls from ctx */
- 	areq->tsgl = sock_kmalloc(sk, sizeof(*areq->tsgl) * sgl->cur,
+ 	areq->tsgl = sock_kmalloc(sk,
+ 				  sizeof(*areq->tsgl) * max_t(u32, sgl->cur, 1),
  				  GFP_KERNEL);
  	if (unlikely(!areq->tsgl))
  		goto free;