Driver: fix CPU model detection in MSR validation

Previously, the functions defined in msr.c used a different copy of the machine_type variable than those in driver.c, resulting in always incorrectly assuming an Intel CPU even when an AMD CPU was successfully detected. By switching to an extern reference to the static variable used by the driver, the CPU mode is again detected successfully. Co-authored-by: Victorien Molle <[email protected]> Signed-off-by: Chris Waldon <[email protected]>
hubblo-org · Feb 28, 2024 · a472cf3 · a472cf3
1 parent bc12fec
commit a472cf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ScaphandreDrv/Driver.c b/ScaphandreDrv/Driver.c
@@ -6,6 +6,8 @@
 #pragma alloc_text (INIT, DriverEntry)
 #endif
 
+e_machine_type machine_type;
+
 NTSTATUS DriverEntry(PDRIVER_OBJECT  DriverObject,
                      PUNICODE_STRING RegistryPath)
 {

diff --git a/ScaphandreDrv/msr.h b/ScaphandreDrv/msr.h
@@ -39,7 +39,7 @@ typedef enum {
 }e_machine_type;
 
 
-static e_machine_type machine_type;
+extern e_machine_type machine_type;
 static unsigned long max_processors;
 
 int validate_msr_lookup(unsigned __int64 msrRegister);