x86: Add missing returns in RNG init, and fail avoid TSC with solo5

includeos · Mar 26, 2019 · 19678c4 · 19678c4
1 parent 3b26db0
commit 19678c4
Showing 1 changed file with 5 additions and 3 deletions.
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");
 }