From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 30 Nov 2016 11:53:12 +0000 (+0800)
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=479d014de544a0916037fcf77e873f815545cd5e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Merge the crypto tree to pull in chelsio chcr fix.
---

479d014de544a0916037fcf77e873f815545cd5e
diff --cc crypto/drbg.c
index 9a95b619e19a,053035b5c8f8..8a4d98b4adba
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@@ -1765,11 -1779,15 +1779,16 @@@ static int drbg_kcapi_sym_ctr(struct dr
  		}
  		init_completion(&drbg->ctr_completion);
  
+ 		memcpy(outbuf, drbg->outscratchpad, cryptlen);
+ 
  		outlen -= cryptlen;
 +		outbuf += cryptlen;
  	}
+ 	ret = 0;
  
- 	return 0;
+ out:
+ 	memzero_explicit(drbg->outscratchpad, DRBG_OUTSCRATCHLEN);
+ 	return ret;
  }
  #endif /* CONFIG_CRYPTO_DRBG_CTR */