diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-10-18 13:41:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-10-18 13:41:00 +0000 |
| commit | b95a881285179d772b1dd9a3fa183d271f998d99 (patch) | |
| tree | 780f1461039e78dd998309eb09546bc004f14d79 | |
| parent | cd77452cf95bd438d68067e85bcb4deb24f03941 (diff) | |
when openbsd.randomdata was made readonly, the proto seed copy got done
too late, leading to poor rng in the kernel early on. a behavioural
artifact in vmm spotted the issue.
ok tedu guenther mlarkin
| -rw-r--r-- | sys/dev/rnd.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c index 04c553eb011..34b20e0b3d1 100644 --- a/sys/dev/rnd.c +++ b/sys/dev/rnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rnd.c,v 1.189 2016/10/07 15:59:36 tedu Exp $ */ +/* $OpenBSD: rnd.c,v 1.190 2016/10/18 13:40:59 deraadt Exp $ */ /* * Copyright (c) 2011 Theo de Raadt. @@ -439,7 +439,6 @@ struct mutex rndlock = MUTEX_INITIALIZER(IPL_HIGH); struct timeout arc4_timeout; struct task arc4_task = TASK_INITIALIZER(arc4_init, NULL); -static int rs_initialized; static chacha_ctx rs; /* chacha context for random keystream */ /* keystream blocks (also chacha seed from boot) */ static u_char rs_buf[RSBUFSZ]; @@ -529,7 +528,12 @@ _rs_stir(int do_lock) static inline void _rs_stir_if_needed(size_t len) { + static int rs_initialized; + if (!rs_initialized) { + memcpy(entropy_pool, entropy_pool0, sizeof entropy_pool); + memcpy(rs_buf, rs_buf0, sizeof rs_buf); + /* seeds cannot be cleaned yet, random_start() will do so */ _rs_init(rs_buf, KEYSZ + IVSZ); rs_count = 1024 * 1024 * 1024; /* until main() runs */ rs_initialized = 1; @@ -578,13 +582,6 @@ _rs_clearseed(const void *p, size_t s) static inline void _rs_rekey(u_char *dat, size_t datlen) { - if (!rs_initialized) { - memcpy(entropy_pool, entropy_pool0, sizeof entropy_pool); - memcpy(rs_buf, rs_buf0, sizeof rs_buf); - rs_initialized = 1; - /* seeds cannot be cleaned yet, random_start() will do so */ - } - #ifndef KEYSTREAM_ONLY memset(rs_buf, 0, RSBUFSZ); #endif @@ -736,7 +733,6 @@ random_start(void) add_entropy_words((u_int32_t *)msgbufp->msg_bufc, msgbufp->msg_bufs / sizeof(u_int32_t)); - rs_initialized = 1; dequeue_randomness(NULL); arc4_init(NULL); timeout_set(&arc4_timeout, arc4_reinit, NULL); |