summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-09-07 00:06:05 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-09-07 00:06:05 +0200
commitc20558d82b6258c45f9438fff7621fd5f47465ce (patch)
treed39958f973f62e2758e78bec69bb2e0b545ea1f9 /drivers
parentcf4244a8063ca5a0062f3f065574b61b4faddf59 (diff)
parent9caead04e2ddf52a6f18539c339cd270d5a94ff4 (diff)
downloadkernel-crypto-ncr-integration.tar.gz
kernel-crypto-ncr-integration.tar.xz
kernel-crypto-ncr-integration.zip
Merge branch 'rhel5-patches' into integrationHEADncr-integration
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/random.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 2849713d223..d702a6ab083 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -952,8 +952,11 @@ static void init_std_data(struct entropy_store *r)
mix_pool_bytes(r, &now, sizeof(now));
mix_pool_bytes(r, utsname(), sizeof(*(utsname())));
/* Enable continuous test in fips mode */
- if (fips_enabled)
+ if (fips_enabled) {
r->last_data = kmalloc(EXTRACT_SIZE, GFP_KERNEL);
+ if (!r->last_data)
+ panic("RNG self test failed to init!\n");
+ }
}
static int rand_initialize(void)