dsanchez/spectre-meltdown-checker
1
0
Fork 0
mirror of https://github.com/speed47/spectre-meltdown-checker synced 2025-01-03 01:55:51 +01:00
Code Issues Releases Wiki Activity

fix: pteinv: don't check kernel image if not available

Browse Source
This commit is contained in:
Stéphane Lesimple 2019-11-23 14:01:56 +01:00
parent 4ba68fba74
commit 5ca7fe91ff
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spectre-meltdown-checker.sh
View File

@ -1111,6 +1111,7 @@ try_decompress()
_debug "try_decompress: magic for $3 found at offset $pos" _debug "try_decompress: magic for $3 found at offset $pos"
if ! command -v "$3" >/dev/null 2>&1; then if ! command -v "$3" >/dev/null 2>&1; then
kernel_err="missing '$3' tool, please install it, usually it's in the '$5' package" kernel_err="missing '$3' tool, please install it, usually it's in the '$5' package"
_debug "try_decompress: $kernel_err"
return 0 return 0
fi fi
pos=${pos%%:*} pos=${pos%%:*}
@ -1144,6 +1145,7 @@ extract_kernel()
# Initial attempt for uncompressed images or objects: # Initial attempt for uncompressed images or objects:
if check_kernel "$1"; then if check_kernel "$1"; then
_debug "extract_kernel: found kernel is valid, no decompression needed"
cat "$1" > "$kerneltmp" cat "$1" > "$kerneltmp"
kernel=$kerneltmp kernel=$kerneltmp
return 0 return 0
@ -4131,6 +4133,10 @@ check_CVE_2018_3620_linux()
if [ "$opt_sysfs_only" != 1 ]; then if [ "$opt_sysfs_only" != 1 ]; then
_info_nol "* Kernel supports PTE inversion: " _info_nol "* Kernel supports PTE inversion: "
if ! command -v "${opt_arch_prefix}strings" >/dev/null 2>&1; then if ! command -v "${opt_arch_prefix}strings" >/dev/null 2>&1; then
pstatus yellow UNKNOWN "missing 'strings' tool, please install it"
pteinv_supported=-1
elif [ -n "$kernel_err" ]; then
pstatus yellow UNKNOWN "$kernel_err"
pteinv_supported=-1 pteinv_supported=-1
else else
if "${opt_arch_prefix}strings" "$kernel" | grep -Fq 'PTE Inversion'; then if "${opt_arch_prefix}strings" "$kernel" | grep -Fq 'PTE Inversion'; then