* [PATCH] random: simplify fips mode
@ 2010-05-20 5:44 Matt Mackall
2010-05-20 9:55 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: Matt Mackall @ 2010-05-20 5:44 UTC (permalink / raw)
To: Herbert Xu; +Cc: Linux Mailing List, Steven Liu
Rather than dynamically allocate 10 bytes, move it to static allocation.
This saves space and avoids the need for error checking.
Signed-off-by: Matt Mackall <mpm@selenic.com>
diff -r a12387bbcc93 drivers/char/random.c
--- a/drivers/char/random.c Thu Apr 08 10:02:02 2010 -0700
+++ b/drivers/char/random.c Thu May 20 00:43:13 2010 -0500
@@ -257,6 +257,7 @@
#define INPUT_POOL_WORDS 128
#define OUTPUT_POOL_WORDS 32
#define SEC_XFER_SIZE 512
+#define EXTRACT_SIZE 10
/*
* The minimum number of bits of entropy before we wake up a read on
@@ -414,7 +415,7 @@
unsigned add_ptr;
int entropy_count;
int input_rotate;
- __u8 *last_data;
+ __u8 last_data[EXTRACT_SIZE];
};
static __u32 input_pool_data[INPUT_POOL_WORDS];
@@ -714,8 +715,6 @@
}
#endif
-#define EXTRACT_SIZE 10
-
/*********************************************************************
*
* Entropy extraction routines
@@ -862,7 +861,7 @@
while (nbytes) {
extract_buf(r, tmp);
- if (r->last_data) {
+ if (fips_enabled) {
spin_lock_irqsave(&r->lock, flags);
if (!memcmp(tmp, r->last_data, EXTRACT_SIZE))
panic("Hardware RNG duplicated output!\n");
@@ -951,9 +950,6 @@
now = ktime_get_real();
mix_pool_bytes(r, &now, sizeof(now));
mix_pool_bytes(r, utsname(), sizeof(*(utsname())));
- /* Enable continuous test in fips mode */
- if (fips_enabled)
- r->last_data = kmalloc(EXTRACT_SIZE, GFP_KERNEL);
}
static int rand_initialize(void)
--
Mathematics is the supreme nostalgia of our time.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] random: simplify fips mode
2010-05-20 5:44 [PATCH] random: simplify fips mode Matt Mackall
@ 2010-05-20 9:55 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2010-05-20 9:55 UTC (permalink / raw)
To: Matt Mackall; +Cc: Linux Mailing List, Steven Liu
On Thu, May 20, 2010 at 12:44:17AM -0500, Matt Mackall wrote:
> Rather than dynamically allocate 10 bytes, move it to static allocation.
> This saves space and avoids the need for error checking.
>
> Signed-off-by: Matt Mackall <mpm@selenic.com>
Patch applied. Thanks a lot!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-20 9:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-20 5:44 [PATCH] random: simplify fips mode Matt Mackall
2010-05-20 9:55 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).