From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Sep 2015 00:38:39 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4c90396ed7ef9b4e4d221e008e54be8bea8307f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

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

  API:

   - the AEAD interface transition is now complete.
   - add top-level skcipher interface.

  Drivers:

   - x86-64 acceleration for chacha20/poly1305.
   - add sunxi-ss Allwinner Security System crypto accelerator.
   - add RSA algorithm to qat driver.
   - add SRIOV support to qat driver.
   - add LS1021A support to caam.
   - add i.MX6 support to caam"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (163 commits)
  crypto: algif_aead - fix for multiple operations on AF_ALG sockets
  crypto: qat - enable legacy VFs
  MPI: Fix mpi_read_buffer
  crypto: qat - silence a static checker warning
  crypto: vmx - Fixing opcode issue
  crypto: caam - Use the preferred style for memory allocations
  crypto: caam - Propagate the real error code in caam_probe
  crypto: caam - Fix the error handling in caam_probe
  crypto: caam - fix writing to JQCR_MS when using service interface
  crypto: hash - Add AHASH_REQUEST_ON_STACK
  crypto: testmgr - Use new skcipher interface
  crypto: skcipher - Add top-level skcipher interface
  crypto: cmac - allow usage in FIPS mode
  crypto: sahara - Use dmam_alloc_coherent
  crypto: caam - Add support for LS1021A
  crypto: qat - Don't move data inside output buffer
  crypto: vmx - Fixing GHASH Key issue on little endian
  crypto: vmx - Fixing AES-CTR counter bug
  crypto: null - Add missing Kconfig tristate for NULL2
  crypto: nx - Add forward declaration for struct crypto_aead
  ...
---

d4c90396ed7ef9b4e4d221e008e54be8bea8307f
diff --cc drivers/crypto/caam/caamhash.c
index f9c78751989e,72acf8e5ac2f..94433b9fc200
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@@ -915,12 -915,11 +915,12 @@@ static int ahash_final_ctx(struct ahash
  	int ret = 0;
  	int sh_len;
  
 -	sec4_sg_bytes = (1 + (buflen ? 1 : 0)) * sizeof(struct sec4_sg_entry);
 +	sec4_sg_src_index = 1 + (buflen ? 1 : 0);
 +	sec4_sg_bytes = sec4_sg_src_index * sizeof(struct sec4_sg_entry);
  
  	/* allocate space for base edesc and hw desc commands, link tables */
- 	edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +
- 			sec4_sg_bytes, GFP_DMA | flags);
+ 	edesc = kzalloc(sizeof(*edesc) + DESC_JOB_IO_LEN + sec4_sg_bytes,
+ 			GFP_DMA | flags);
  	if (!edesc) {
  		dev_err(jrdev, "could not allocate extended descriptor\n");
  		return -ENOMEM;