diff options
author | Kees Cook <keescook@chromium.org> | 2013-11-11 17:28:39 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2013-11-12 01:29:44 -0500 |
commit | a653f3563c51c7bb7de63d607bef09d3baddaeb8 (patch) | |
tree | bb431f947a59f2301aa81e9f347dc8b531b524b4 /arch/x86/boot/bitops.h | |
parent | aec58bafaf89279522c44ec8ca9211eabb2b6976 (diff) |
x86, kaslr: Mix entropy sources together as needed
Depending on availability, mix the RDRAND and RDTSC entropy together with
XOR. Only when neither is available should the i8254 be used. Update
the Kconfig documentation to reflect this. Additionally, since bits
used for entropy is masked elsewhere, drop the needless masking in
the get_random_long(). Similarly, use the entire TSC, not just the low
32 bits.
Finally, to improve the starting entropy, do a simple hashing of a
build-time versions string and the boot-time boot_params structure for
some additional level of unpredictability.
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/20131111222839.GA28616@www.outflux.net
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/bitops.h')
0 files changed, 0 insertions, 0 deletions