shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-09 17:44:49 +03:00
Code Activity

random-util: call initialize_srand() after fork()

Browse Source
This commit is contained in:
Yu Watanabe
2019-12-16 19:47:48 +09:00
parent 024941a521
commit a0f11d1d11
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/basic/random-util.c
View File

@@ -7,6 +7,7 @@
#include <elf.h> #include <elf.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <pthread.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@@ -28,6 +29,8 @@
#include "siphash24.h" #include "siphash24.h"
#include "time-util.h" #include "time-util.h"
static bool srand_called = false;
int rdrand(unsigned long *ret) { int rdrand(unsigned long *ret) {
/* So, you are a "security researcher", and you wonder why we bother with using raw RDRAND here, /* So, you are a "security researcher", and you wonder why we bother with using raw RDRAND here,
@@ -272,8 +275,12 @@ int genuine_random_bytes(void *p, size_t n, RandomFlags flags) {
return loop_read_exact(fd, p, n, true); return loop_read_exact(fd, p, n, true);
} }
static void clear_srand_initialization(void) {
srand_called = false;
}
void initialize_srand(void) { void initialize_srand(void) {
static bool srand_called = false; static bool pthread_atfork_registered = false;
unsigned x; unsigned x;
#if HAVE_SYS_AUXV_H #if HAVE_SYS_AUXV_H
const void *auxv; const void *auxv;
@@ -309,6 +316,11 @@ void initialize_srand(void) {
srand(x); srand(x);
srand_called = true; srand_called = true;
if (!pthread_atfork_registered) {
(void) pthread_atfork(NULL, NULL, clear_srand_initialization);
pthread_atfork_registered = true;
}
} }
/* INT_MAX gives us only 31 bits, so use 24 out of that. */ /* INT_MAX gives us only 31 bits, so use 24 out of that. */