mirror of
https://github.com/speed47/spectre-meltdown-checker
synced 2024-11-07 06:33:38 +01:00
cpuid and msr module check
This adds a check before loading the cpuid and msr modules under linux, ensuring they are not unloaded in exit_cleanup() if they were initially present.
This commit is contained in:
parent
4acd0f647a
commit
1c0f6d9580
@ -732,8 +732,12 @@ mount_debugfs()
|
|||||||
load_msr()
|
load_msr()
|
||||||
{
|
{
|
||||||
if [ "$os" = Linux ]; then
|
if [ "$os" = Linux ]; then
|
||||||
modprobe msr 2>/dev/null && insmod_msr=1
|
if ! grep -e msr /proc/modules 2>/dev/null; then
|
||||||
_debug "attempted to load module msr, insmod_msr=$insmod_msr"
|
modprobe msr 2>/dev/null && insmod_msr=1
|
||||||
|
_debug "attempted to load module msr, insmod_msr=$insmod_cpuid"
|
||||||
|
else
|
||||||
|
_debug "msr module already loaded"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
if ! kldstat -q -m cpuctl; then
|
if ! kldstat -q -m cpuctl; then
|
||||||
kldload cpuctl 2>/dev/null && kldload_cpuctl=1
|
kldload cpuctl 2>/dev/null && kldload_cpuctl=1
|
||||||
@ -747,8 +751,12 @@ load_msr()
|
|||||||
load_cpuid()
|
load_cpuid()
|
||||||
{
|
{
|
||||||
if [ "$os" = Linux ]; then
|
if [ "$os" = Linux ]; then
|
||||||
modprobe cpuid 2>/dev/null && insmod_cpuid=1
|
if ! grep -e cpuid /proc/modules 2>/dev/null; then
|
||||||
_debug "attempted to load module cpuid, insmod_cpuid=$insmod_cpuid"
|
modprobe cpuid 2>/dev/null && insmod_cpuid=1
|
||||||
|
_debug "attempted to load module cpuid, insmod_cpuid=$insmod_cpuid"
|
||||||
|
else
|
||||||
|
_debug "cpuid module already loaded"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
if ! kldstat -q -m cpuctl; then
|
if ! kldstat -q -m cpuctl; then
|
||||||
kldload cpuctl 2>/dev/null && kldload_cpuctl=1
|
kldload cpuctl 2>/dev/null && kldload_cpuctl=1
|
||||||
|
Loading…
Reference in New Issue
Block a user