stats: fix io_u_plat out-of-bound accesses (round 2)

[fio.git] / lib / rand.c

diff --git a/lib/rand.c b/lib/rand.c
index 839a6a9476c82cedad1de30067ab06c776d750bd..3b2d67ad6e9ebc4a242b24c162f94aa667a11743 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -43,34 +43,49 @@ static inline int __seed(unsigned int x, unsigned int m)
        return (x < m) ? x + m : x;
 }
 
+static void __init_rand(struct frand_state *state, unsigned int seed)
+{
+       int cranks = 6;
+
+#define LCG(x, seed)  ((x) * 69069 ^ (seed))
+
+       state->s1 = __seed(LCG((2^31) + (2^17) + (2^7), seed), 1);
+       state->s2 = __seed(LCG(state->s1, seed), 7);
+       state->s3 = __seed(LCG(state->s2, seed), 15);
+
+       while (cranks--)
+               __rand(state);
+}
+
 void init_rand(struct frand_state *state)
 {
-#define LCG(x)  ((x) * 69069)   /* super-duper LCG */
-
-       state->s1 = __seed(LCG((2^31) + (2^17) + (2^7)), 1);
-       state->s2 = __seed(LCG(state->s1), 7);
-       state->s3 = __seed(LCG(state->s2), 15);
-
-       __rand(state);
-       __rand(state);
-       __rand(state);
-       __rand(state);
-       __rand(state);
-       __rand(state);
+       __init_rand(state, 1);
 }
 
-void fill_random_buf(void *buf, unsigned int len)
+void init_rand_seed(struct frand_state *state, unsigned int seed)
 {
-       unsigned long r = __rand(&__fio_rand_state);
-       long *ptr = buf;
+       __init_rand(state, seed);
+}
 
-       if (sizeof(int) != sizeof(*ptr))
-               r *= (unsigned long) __rand(&__fio_rand_state);
+void __fill_random_buf(void *buf, unsigned int len, unsigned long seed)
+{
+       long *ptr = buf;
 
        while ((void *) ptr - buf < len) {
-               *ptr = r;
+               *ptr = seed;
                ptr++;
-               r *= GOLDEN_RATIO_PRIME;
-               r >>= 3;
+               seed *= GOLDEN_RATIO_PRIME;
+               seed >>= 3;
        }
 }
+
+unsigned long fill_random_buf(void *buf, unsigned int len)
+{
+       unsigned long r = __rand(&__fio_rand_state);
+
+       if (sizeof(int) != sizeof(long *))
+               r *= (unsigned long) __rand(&__fio_rand_state);
+
+       __fill_random_buf(buf, len, r);
+       return r;
+}