git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Fix potential leak during flow mods.
[sliver-openvswitch.git]
/
lib
/
random.c
diff --git
a/lib/random.c
b/lib/random.c
index
7f89251
..
c0bc659
100644
(file)
--- a/
lib/random.c
+++ b/
lib/random.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010
, 2011, 2012, 2013 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,6
+22,9
@@
#include <sys/time.h>
#include "entropy.h"
#include <sys/time.h>
#include "entropy.h"
+#include "hash.h"
+#include "ovs-thread.h"
+#include "timeval.h"
#include "util.h"
/* This is the 32-bit PRNG recommended in G. Marsaglia, "Xorshift RNGs",
#include "util.h"
/* This is the 32-bit PRNG recommended in G. Marsaglia, "Xorshift RNGs",
@@
-36,26
+39,35
@@
* cryptographic-quality randomness. */
/* Current random state. */
* cryptographic-quality randomness. */
/* Current random state. */
-
static uint32_t seed
;
+
DEFINE_STATIC_PER_THREAD_DATA(uint32_t, seed, 0)
;
static uint32_t random_next(void);
void
random_init(void)
{
static uint32_t random_next(void);
void
random_init(void)
{
- while (!seed) {
+ uint32_t *seedp = seed_get();
+ while (!*seedp) {
struct timeval tv;
uint32_t entropy;
struct timeval tv;
uint32_t entropy;
+ pthread_t self;
- if (gettimeofday(&tv, NULL) < 0) {
- ovs_fatal(errno, "gettimeofday");
- }
+ xgettimeofday(&tv);
get_entropy_or_die(&entropy, 4);
get_entropy_or_die(&entropy, 4);
+ self = pthread_self();
- seed = tv.tv_sec ^ tv.tv_usec ^ entropy;
+ *seedp = (tv.tv_sec ^ tv.tv_usec ^ entropy
+ ^ hash_bytes(&self, sizeof self, 0));
}
}
}
}
+void
+random_set_seed(uint32_t seed_)
+{
+ ovs_assert(seed_);
+ *seed_get() = seed_;
+}
+
void
random_bytes(void *p_, size_t n)
{
void
random_bytes(void *p_, size_t n)
{
@@
-74,17
+86,6
@@
random_bytes(void *p_, size_t n)
}
}
}
}
-uint8_t
-random_uint8(void)
-{
- return random_uint32();
-}
-
-uint16_t
-random_uint16(void)
-{
- return random_uint32();
-}
uint32_t
random_uint32(void)
uint32_t
random_uint32(void)
@@
-93,18
+94,26
@@
random_uint32(void)
return random_next();
}
return random_next();
}
-
in
t
-random_
range(int max
)
+
uint64_
t
+random_
uint64(void
)
{
{
- return random_uint32() % max;
+ uint64_t x;
+
+ random_init();
+
+ x = random_next();
+ x |= (uint64_t) random_next() << 32;
+ return x;
}
static uint32_t
random_next(void)
{
}
static uint32_t
random_next(void)
{
- seed ^= seed << 13;
- seed ^= seed >> 17;
- seed ^= seed << 5;
+ uint32_t *seedp = seed_get_unsafe();
+
+ *seedp ^= *seedp << 13;
+ *seedp ^= *seedp >> 17;
+ *seedp ^= *seedp << 5;
- return
seed
;
+ return
*seedp
;
}
}