X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=crypto%2Fansi_cprng.c;h=6ddd99e6114b08fcef25cde0a3cfaa31885e9556;hb=f1d9e9c767f96f57a3cca5304c046f692e115ec9;hp=ffa0245e2abceb5b79b7d2f46a7407b6ea03b971;hpb=2ff55e98d6e662a4887d2c688a4ab2ae510a97df;p=cascardo%2Flinux.git

diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c
index ffa0245e2abc..6ddd99e6114b 100644
--- a/crypto/ansi_cprng.c
+++ b/crypto/ansi_cprng.c
@@ -414,10 +414,18 @@ static int fips_cprng_get_random(struct crypto_rng *tfm, u8 *rdata,
 static int fips_cprng_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen)
 {
 	u8 rdata[DEFAULT_BLK_SZ];
+	u8 *key = seed + DEFAULT_BLK_SZ;
 	int rc;
 
 	struct prng_context *prng = crypto_rng_ctx(tfm);
 
+	if (slen < DEFAULT_PRNG_KSZ + DEFAULT_BLK_SZ)
+		return -EINVAL;
+
+	/* fips strictly requires seed != key */
+	if (!memcmp(seed, key, DEFAULT_PRNG_KSZ))
+		return -EINVAL;
+
 	rc = cprng_reset(tfm, seed, slen);
 
 	if (!rc)