aboutsummaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2021-07-21 15:25:46 +0000
committerAlexander Motin <mav@FreeBSD.org>2021-07-21 15:32:22 +0000
commit3a57f08b5042f15bb8ffb2fcce99d082d225d4cf (patch)
tree063f3c771fa67d7c7bc930bd824c3cd8dcbab6a4 /lib/libc
parent2ae65d449fecf22f493ce2dcb9e293bb8d95c8ef (diff)
downloadsrc-3a57f08b5042f15bb8ffb2fcce99d082d225d4cf.tar.gz
src-3a57f08b5042f15bb8ffb2fcce99d082d225d4cf.zip
Fix race between first rand(3) calls with _once().
Before this patch there was a chance for thread that called rand(3) slightly later to see rand3_state already allocated, but not yet initialized. While this API is not expected to be thread-safe, it is not expected to crash. ztest on 64-thread system reproduced it reliably for me. Submitted by: avg@ MFC after: 1 month
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/stdlib/rand.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index bddb0f040302..e448d1b1fd14 100644
--- a/lib/libc/stdlib/rand.c
+++ b/lib/libc/stdlib/rand.c
@@ -41,11 +41,13 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sysctl.h>
#include <assert.h>
+#include <pthread.h>
#include <stdbool.h>
#include <stdlib.h>
#include <syslog.h>
#include "un-namespace.h"
+#include "libc_private.h"
#include "random.h"
/*
@@ -64,6 +66,7 @@ __FBSDID("$FreeBSD$");
* the advantage of being the one already in the tree.
*/
static struct __random_state *rand3_state;
+static pthread_once_t rand3_state_once = PTHREAD_ONCE_INIT;
static void
initialize_rand3(void)
@@ -78,16 +81,14 @@ initialize_rand3(void)
int
rand(void)
{
- if (rand3_state == NULL)
- initialize_rand3();
+ _once(&rand3_state_once, initialize_rand3);
return ((int)random_r(rand3_state));
}
void
srand(unsigned seed)
{
- if (rand3_state == NULL)
- initialize_rand3();
+ _once(&rand3_state_once, initialize_rand3);
srandom_r(rand3_state, seed);
}