kernelldr: miscellaneous fixes

libraries/libmesosphere/source/board/nintendo/switch/kern_k_system_control.cpp

@@ -86,13 +86,11 @@ namespace ams::kern {
     }
 
     u64 KSystemControl::GenerateRandomRange(u64 min, u64 max) {
-        /* This is a biased random, but this is okay for now. */
-        /* TODO: unbiased random? */
         const u64 range_size    = ((max + 1) - min);
         const u64 effective_max = (std::numeric_limits<u64>::max() / range_size) * range_size;
         while (true) {
             if (const u64 rnd = GenerateRandomU64(); rnd < effective_max) {
-                return rnd % effective_max;
+                return min + (rnd % range_size);
             }
         }
     }

libraries/libmesosphere/source/board/nintendo/switch/kern_secure_monitor.cpp

@@ -83,7 +83,7 @@ namespace ams::kern::smc {
     void GenerateRandomBytes(void *dst, size_t size) {
         /* Call SmcGenerateRandomBytes() */
         /* TODO: Lock this to ensure only one core calls at once. */
-        SecureMonitorArguments args = { FunctionId_GetConfig, size };
+        SecureMonitorArguments args = { FunctionId_GenerateRandomBytes, size };
         MESOSPHERE_ABORT_UNLESS(size <= sizeof(args) - sizeof(args.x[0]));
         CallPrivilegedSecureMonitorFunction(args);
         MESOSPHERE_ABORT_UNLESS((static_cast<SmcResult>(args.x[0]) == SmcResult::Success));