diff options
| author | Stéphane Lesimple <speed47_github@speed47.net> | 2018-01-08 00:45:12 +0100 |
|---|---|---|
| committer | Stéphane Lesimple <speed47_github@speed47.net> | 2018-01-08 00:45:12 +0100 |
| commit | 96dfa03c000052e9d69ba00c62327caa83aa34bf (patch) | |
| tree | 7532419285ddb38c993dcf1baef8cbf32d162680 | |
| parent | 05c79425ab30b62d424f7502765006127b0990cc (diff) | |
| download | spectre-meltdown-checker-96dfa03c000052e9d69ba00c62327caa83aa34bf.tar.lz spectre-meltdown-checker-96dfa03c000052e9d69ba00c62327caa83aa34bf.tar.xz spectre-meltdown-checker-96dfa03c000052e9d69ba00c62327caa83aa34bf.zip | |
fix for uncompressed vmlinux case
| -rwxr-xr-x | spectre-meltdown-checker.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh index dfa8a63..b0ac923 100755 --- a/spectre-meltdown-checker.sh +++ b/spectre-meltdown-checker.sh @@ -1,7 +1,7 @@ #! /bin/sh # Spectre & Meltdown checker # Stephane Lesimple -VERSION=0.08 +VERSION=0.09 pstatus() { @@ -43,7 +43,7 @@ try_decompress() do pos=${pos%%:*} tail -c+$pos "$img" | $3 > $vmlinuxtmp 2> /dev/null - check_vmlinux $vmlinuxtmp && echo $vmlinuxtmp || rm -f $vmlinuxtmp + check_vmlinux $vmlinuxtmp && echo $vmlinuxtmp && return 0 done } @@ -55,7 +55,11 @@ extract_vmlinux() vmlinuxtmp=$(mktemp /tmp/vmlinux-XXX) # Initial attempt for uncompressed images or objects: - check_vmlinux $img + if check_vmlinux $img; then + cat $img > $vmlinuxtmp + echo $vmlinuxtmp + return 0 + fi # That didn't work, so retry after decompression. try_decompress '\037\213\010' xy gunzip || \ @@ -77,6 +81,7 @@ status=0 img='' [ -e /boot/vmlinuz-$(uname -r) ] && img=/boot/vmlinuz-$(uname -r) [ -e /boot/vmlinux-$(uname -r) ] && img=/boot/vmlinux-$(uname -r) +[ -e /boot/kernel-$( uname -r) ] && img=/boot/kernel-$( uname -r) [ -e /boot/bzImage-$(uname -r) ] && img=/boot/bzImage-$(uname -r) if [ -z "$img" ]; then pstatus yellow UNKNOWN "couldn't find your kernel image in /boot" @@ -256,5 +261,5 @@ if [ "$USER" != root ]; then /bin/echo "You can try the following command: sudo $0" fi -[ -n "$vmlinux" ] && rm -f "$vmlinux" +[ -n "$vmlinux" -a -f "$vmlinux" ] && rm -f "$vmlinux" |