From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2016 18:22:54 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70477371dc350746d10431d74f0f213a8d59924c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

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

  API:
   - Convert remaining crypto_hash users to shash or ahash, also convert
     blkcipher/ablkcipher users to skcipher.
   - Remove crypto_hash interface.
   - Remove crypto_pcomp interface.
   - Add crypto engine for async cipher drivers.
   - Add akcipher documentation.
   - Add skcipher documentation.

  Algorithms:
   - Rename crypto/crc32 to avoid name clash with lib/crc32.
   - Fix bug in keywrap where we zero the wrong pointer.

  Drivers:
   - Support T5/M5, T7/M7 SPARC CPUs in n2 hwrng driver.
   - Add PIC32 hwrng driver.
   - Support BCM6368 in bcm63xx hwrng driver.
   - Pack structs for 32-bit compat users in qat.
   - Use crypto engine in omap-aes.
   - Add support for sama5d2x SoCs in atmel-sha.
   - Make atmel-sha available again.
   - Make sahara hashing available again.
   - Make ccp hashing available again.
   - Make sha1-mb available again.
   - Add support for multiple devices in ccp.
   - Improve DMA performance in caam.
   - Add hashing support to rockchip"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
  crypto: qat - remove redundant arbiter configuration
  crypto: ux500 - fix checks of error code returned by devm_ioremap_resource()
  crypto: atmel - fix checks of error code returned by devm_ioremap_resource()
  crypto: qat - Change the definition of icp_qat_uof_regtype
  hwrng: exynos - use __maybe_unused to hide pm functions
  crypto: ccp - Add abstraction for device-specific calls
  crypto: ccp - CCP versioning support
  crypto: ccp - Support for multiple CCPs
  crypto: ccp - Remove check for x86 family and model
  crypto: ccp - memset request context to zero during import
  lib/mpi: use "static inline" instead of "extern inline"
  lib/mpi: avoid assembler warning
  hwrng: bcm63xx - fix non device tree compatibility
  crypto: testmgr - allow rfc3686 aes-ctr variants in fips mode.
  crypto: qat - The AE id should be less than the maximal AE number
  lib/mpi: Endianness fix
  crypto: rockchip - add hash support for crypto engine in rk3288
  crypto: xts - fix compile errors
  crypto: doc - add skcipher API documentation
  crypto: doc - update AEAD AD handling
  ...
---

70477371dc350746d10431d74f0f213a8d59924c
diff --cc drivers/crypto/atmel-sha.c
index 8bf9914d4d15,4b2dd95782bf..97e34799e077
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@@ -1461,9 -1539,8 +1543,10 @@@ err_algs
  	if (sha_dd->caps.has_dma)
  		atmel_sha_dma_cleanup(sha_dd);
  err_sha_dma:
 +iclk_unprepare:
 +	clk_unprepare(sha_dd->iclk);
  res_err:
+ 	tasklet_kill(&sha_dd->queue_task);
  	tasklet_kill(&sha_dd->done_task);
  sha_dd_err:
  	dev_err(dev, "initialization failed.\n");
diff --cc net/ipv4/tcp.c
index 483ffdf5aa4d,91ffef3a55d2..4804645bdf02
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@@ -2943,17 -2939,26 +2943,26 @@@ static bool tcp_md5sig_pool_populated 
  
  static void __tcp_alloc_md5sig_pool(void)
  {
+ 	struct crypto_ahash *hash;
  	int cpu;
  
+ 	hash = crypto_alloc_ahash("md5", 0, CRYPTO_ALG_ASYNC);
 -	if (IS_ERR_OR_NULL(hash))
++	if (IS_ERR(hash))
+ 		return;
+ 
  	for_each_possible_cpu(cpu) {
- 		if (!per_cpu(tcp_md5sig_pool, cpu).md5_desc.tfm) {
- 			struct crypto_hash *hash;
+ 		struct ahash_request *req;
  
- 			hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
- 			if (IS_ERR(hash))
- 				return;
- 			per_cpu(tcp_md5sig_pool, cpu).md5_desc.tfm = hash;
- 		}
+ 		if (per_cpu(tcp_md5sig_pool, cpu).md5_req)
+ 			continue;
+ 
+ 		req = ahash_request_alloc(hash, GFP_KERNEL);
+ 		if (!req)
+ 			return;
+ 
+ 		ahash_request_set_callback(req, 0, NULL, NULL);
+ 
+ 		per_cpu(tcp_md5sig_pool, cpu).md5_req = req;
  	}
  	/* before setting tcp_md5sig_pool_populated, we must commit all writes
  	 * to memory. See smp_rmb() in tcp_get_md5sig_pool()