From e4f9465f6f085af12f766da874b94ffc44865363 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Wed, 9 Nov 2011 12:04:06 +0800
Subject: [PATCH] --- yaml --- r: 283283 b: refs/heads/master c:
 505172e11f5a0d9916e20e40d3b0a6f87d3a59b6 h: refs/heads/master i:   283281:
 a6e795c3bd3c187f11bd6b10890c118b433a704c   283279:
 e5cca2d7e97887b0fd54869d01f05dfd5e29117f v: v3

---
 [refs]                    | 2 +-
 trunk/crypto/ansi_cprng.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9b2f013ac875..d518f3c123c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bae6d3038b7faff187f4207448a40b9912cf787d
+refs/heads/master: 505172e11f5a0d9916e20e40d3b0a6f87d3a59b6
diff --git a/trunk/crypto/ansi_cprng.c b/trunk/crypto/ansi_cprng.c
index ffa0245e2abc..6ddd99e6114b 100644
--- a/trunk/crypto/ansi_cprng.c
+++ b/trunk/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)