aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Triplett <josht@us.ibm.com>2006-10-04 05:17:12 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:31 -0400
commit75cfef32f26d03f5d0a0833572d52f94ad858a36 (patch)
tree2440ee021888c4d743cf403a75d859060127479b
parent2860aaba4dc87fa43c08724434b87a8650f3bff5 (diff)
[PATCH] rcu: Fix sign bug making rcu_random always return the same sequence
rcu_random uses a counter rrs_count to occasionally mix data from get_random_bytes into the state of its pseudorandom generator. However, the rrs_counter gets declared as an unsigned long, and rcu_random checks for --rrs_count < 0, so this code will never mix any real random data into the state, and will thus always return the same sequence of random numbers. Also, change the return value of rcu_random from long to unsigned long, to avoid potential issues caused by the use of the % operator, which can return negative values for negative left operands. Signed-off-by: Josh Triplett <josh@freedesktop.org> Acked-by: Paul E. McKenney <paulmck@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/rcutorture.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index 42e7f01e8003..43d6d4f9ef09 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -147,7 +147,7 @@ rcu_torture_free(struct rcu_torture *p)
147 147
148struct rcu_random_state { 148struct rcu_random_state {
149 unsigned long rrs_state; 149 unsigned long rrs_state;
150 unsigned long rrs_count; 150 long rrs_count;
151}; 151};
152 152
153#define RCU_RANDOM_MULT 39916801 /* prime */ 153#define RCU_RANDOM_MULT 39916801 /* prime */
@@ -160,7 +160,7 @@ struct rcu_random_state {
160 * Crude but fast random-number generator. Uses a linear congruential 160 * Crude but fast random-number generator. Uses a linear congruential
161 * generator, with occasional help from get_random_bytes(). 161 * generator, with occasional help from get_random_bytes().
162 */ 162 */
163static long 163static unsigned long
164rcu_random(struct rcu_random_state *rrsp) 164rcu_random(struct rcu_random_state *rrsp)
165{ 165{
166 long refresh; 166 long refresh;