dsanchez/spectre-meltdown-checker
1
0
Fork 0
mirror of https://github.com/speed47/spectre-meltdown-checker synced 2024-11-07 06:33:38 +01:00
Code Issues Releases Wiki Activity

fix(cpu): trust is_cpu_vulnerable even w/ debugfs

Browse Source 
For variant3 under AMD, the debugfs vulnerabilities hierarchy
flags the system as Vulnerable, which is wrong. Trust our own
is_cpu_vulnerable() func in that case
This commit is contained in:
Stéphane Lesimple 2018-01-22 11:00:54 +01:00
parent 147462c0ab
commit d55bafde19
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spectre-meltdown-checker.sh
View File

@ -851,8 +851,7 @@ check_variant1()
status=UNK status=UNK
fi fi
# if we have the /sys interface, don't even check is_cpu_vulnerable ourselves, the kernel already does it if ! is_cpu_vulnerable 1; then
if [ "$sys_interface_available" = 0 ] && ! is_cpu_vulnerable 1; then
# override status & msg in case CPU is not vulnerable after all # override status & msg in case CPU is not vulnerable after all
msg="your CPU vendor reported your CPU model as not vulnerable" msg="your CPU vendor reported your CPU model as not vulnerable"
status=OK status=OK
@ -1104,7 +1103,7 @@ check_variant2()
unload_cpuid unload_cpuid
_info "* Mitigation 2" _info "* Mitigation 2"
_info_nol "* Kernel compiled with retpoline option: " _info_nol " * Kernel compiled with retpoline option: "
# We check the RETPOLINE kernel options # We check the RETPOLINE kernel options
if [ -r "$opt_config" ]; then if [ -r "$opt_config" ]; then
if grep -q '^CONFIG_RETPOLINE=y' "$opt_config"; then if grep -q '^CONFIG_RETPOLINE=y' "$opt_config"; then
@ -1118,7 +1117,7 @@ check_variant2()
pstatus yellow UNKNOWN "couldn't read your kernel configuration" pstatus yellow UNKNOWN "couldn't read your kernel configuration"
fi fi
_info_nol "* Kernel compiled with a retpoline-aware compiler: " _info_nol " * Kernel compiled with a retpoline-aware compiler: "
# Now check if the compiler used to compile the kernel knows how to insert retpolines in generated asm # Now check if the compiler used to compile the kernel knows how to insert retpolines in generated asm
# For gcc, this is -mindirect-branch=thunk-extern (detected by the kernel makefiles) # For gcc, this is -mindirect-branch=thunk-extern (detected by the kernel makefiles)
# See gcc commit https://github.com/hjl-tools/gcc/commit/23b517d4a67c02d3ef80b6109218f2aadad7bd79 # See gcc commit https://github.com/hjl-tools/gcc/commit/23b517d4a67c02d3ef80b6109218f2aadad7bd79
@ -1163,7 +1162,7 @@ check_variant2()
[ "$retpoline" = 1 ] && pstatus yellow UNKNOWN "couldn't find your kernel image or System.map" || pstatus red NO [ "$retpoline" = 1 ] && pstatus yellow UNKNOWN "couldn't find your kernel image or System.map" || pstatus red NO
fi fi
_info_nol "* Retpoline enabled: " _info_nol " * Retpoline enabled: "
if [ "$opt_live" = 1 ]; then if [ "$opt_live" = 1 ]; then
# kernel adds this flag when retpoline is supported and enabled, # kernel adds this flag when retpoline is supported and enabled,
# regardless of the fact that it's minimal / full and generic / amd # regardless of the fact that it's minimal / full and generic / amd
@ -1183,8 +1182,7 @@ check_variant2()
fi fi
cve='CVE-2017-5715' cve='CVE-2017-5715'
# if we have the /sys interface, don't even check is_cpu_vulnerable ourselves, the kernel already does it if ! is_cpu_vulnerable 2; then
if [ "$sys_interface_available" = 0 ] && ! is_cpu_vulnerable 2; then
# override status & msg in case CPU is not vulnerable after all # override status & msg in case CPU is not vulnerable after all
pvulnstatus $cve OK "your CPU vendor reported your CPU model as not vulnerable" pvulnstatus $cve OK "your CPU vendor reported your CPU model as not vulnerable"
elif [ -z "$msg" ]; then elif [ -z "$msg" ]; then
@ -1359,9 +1357,8 @@ check_variant3()
status=UNK status=UNK
fi fi
# if we have the /sys interface, don't even check is_cpu_vulnerable ourselves, the kernel already does it
cve='CVE-2017-5754' cve='CVE-2017-5754'
if [ "$sys_interface_available" = 0 ] && ! is_cpu_vulnerable 3; then if ! is_cpu_vulnerable 3; then
# override status & msg in case CPU is not vulnerable after all # override status & msg in case CPU is not vulnerable after all
pvulnstatus $cve OK "your CPU vendor reported your CPU model as not vulnerable" pvulnstatus $cve OK "your CPU vendor reported your CPU model as not vulnerable"
elif [ -z "$msg" ]; then elif [ -z "$msg" ]; then