diff options
author | Mark Johnston <markj@FreeBSD.org> | 2021-08-13 13:52:05 +0000 |
---|---|---|
committer | Mark Johnston <markj@FreeBSD.org> | 2021-08-13 13:58:42 +0000 |
commit | 3d69515cfea2781b318ebe1c6e6018d817cde358 (patch) | |
tree | 5bd347c72b968fa5f924f503bc203ebdd6b61497 /sys/libkern | |
parent | e0e3ded78a5d0859f3520c541726b815897ba7b0 (diff) | |
download | src-3d69515cfea2781b318ebe1c6e6018d817cde358.tar.gz src-3d69515cfea2781b318ebe1c6e6018d817cde358.zip |
arc4random: Avoid KMSAN false positives from pre-seeding results
If code calls arc4random(), and our RNG is not yet seeded and
random_bypass_before_seeding is true, we'll compute a key using the
SHA256 hash of some hopefully hard-to-predict data, including the
contents of an uninitialized stack buffer (which is also the output
buffer).
When KMSAN is enabled, this use of uninitialized state propagtes through
to the arc4random() output, resulting in false positives. To address
this, lie to KMSAN and explicitly mark the buffer as initialized.
Reviewed by: cem (previous version)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D31510
Diffstat (limited to 'sys/libkern')
-rw-r--r-- | sys/libkern/arc4random.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/libkern/arc4random.c b/sys/libkern/arc4random.c index a4bee71c0efd..fd362dd83608 100644 --- a/sys/libkern/arc4random.c +++ b/sys/libkern/arc4random.c @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/linker.h> #include <sys/lock.h> #include <sys/malloc.h> +#include <sys/msan.h> #include <sys/mutex.h> #include <sys/random.h> #include <sys/smp.h> @@ -106,6 +107,14 @@ chacha20_randomstir(struct chacha20_s *chacha20) "enabled.\n"); } + /* + * "key" is intentionally left uninitialized here, so with KMSAN + * enabled the arc4random() return value may be marked + * uninitialized, leading to spurious reports. Lie to KMSAN to + * avoid this situation. + */ + kmsan_mark(key, sizeof(key), KMSAN_STATE_INITED); + /* Last ditch effort to inject something in a bad condition. */ cc = get_cyclecount(); SHA256_Init(&ctx); |