summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2014-05-11 20:25:20 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2014-05-11 20:25:20 -0700
commit7a5091d58419b4e5222abce58a40c072786ea1d6 (patch)
tree5539029ddca915b6c5d1e4e688e2943393c3f811 /arch
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c (diff)
downloadlinux-stable-7a5091d58419b4e5222abce58a40c072786ea1d6.tar.gz
linux-stable-7a5091d58419b4e5222abce58a40c072786ea1d6.tar.bz2
linux-stable-7a5091d58419b4e5222abce58a40c072786ea1d6.zip
x86, rdrand: When nordrand is specified, disable RDSEED as well
One can logically expect that when the user has specified "nordrand", the user doesn't want any use of the CPU random number generator, neither RDRAND nor RDSEED, so disable both. Reported-by: Stephan Mueller <smueller@chronox.de> Cc: Theodore Ts'o <tytso@mit.edu> Link: http://lkml.kernel.org/r/21542339.0lFnPSyGRS@myon.chronox.de Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/rdrand.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/rdrand.c b/arch/x86/kernel/cpu/rdrand.c
index 384df5105fbc..136ac74dee82 100644
--- a/arch/x86/kernel/cpu/rdrand.c
+++ b/arch/x86/kernel/cpu/rdrand.c
@@ -27,6 +27,7 @@
static int __init x86_rdrand_setup(char *s)
{
setup_clear_cpu_cap(X86_FEATURE_RDRAND);
+ setup_clear_cpu_cap(X86_FEATURE_RDSEED);
return 1;
}
__setup("nordrand", x86_rdrand_setup);