Merge pull request #2100 from fwsGonzo/early_rng

MagnusS · web-flow · commit 35605b0f707e · 2019-03-26T14:10:44.000+01:00
x86: Add missing returns in RNG init, and fail avoid TSC with solo5
diff --git a/src/platform/x86_pc/rand.cpp b/src/platform/x86_pc/rand.cpp
@@ -24,13 +24,15 @@ void RNG::init()
 {
   if (CPUID::has_feature(CPUID::Feature::RDSEED)) {
     rng_reseed_init(intel_rdseed, 2);
+    return;
   }
   else if (CPUID::has_feature(CPUID::Feature::RDRAND)) {
     rng_reseed_init(intel_rdrand, 65);
-  }
-  else {
-    rng_reseed_init(fallback_entropy, 64*16);
     return;
   }
+#ifndef PLATFORM_x86_solo5
+  rng_reseed_init(fallback_entropy, 64*16);
+  return;
+#endif
   assert(0 && "No randomness fallback");
 }

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,15 @@ void RNG::init()`
`24`	`24`	`{`
`25`	`25`	`if (CPUID::has_feature(CPUID::Feature::RDSEED)) {`
`26`	`26`	`rng_reseed_init(intel_rdseed, 2);`
	`27`	`+ return;`
`27`	`28`	`}`
`28`	`29`	`else if (CPUID::has_feature(CPUID::Feature::RDRAND)) {`
`29`	`30`	`rng_reseed_init(intel_rdrand, 65);`
`30`		`- }`
`31`		`- else {`
`32`		`- rng_reseed_init(fallback_entropy, 64*16);`
`33`	`31`	`return;`
`34`	`32`	`}`
	`33`	`+#ifndef PLATFORM_x86_solo5`
	`34`	`+ rng_reseed_init(fallback_entropy, 64*16);`
	`35`	`+ return;`
	`36`	`+#endif`
`35`	`37`	`assert(0 && "No randomness fallback");`
`36`	`38`	`}`