diff options
| author | Stéphane Lesimple <speed47_github@speed47.net> | 2018-01-07 22:47:41 +0100 |
|---|---|---|
| committer | Stéphane Lesimple <speed47_github@speed47.net> | 2018-01-07 22:47:41 +0100 |
| commit | 05c79425ab30b62d424f7502765006127b0990cc (patch) | |
| tree | 5cbe6439491260f14b87ed9276ab259f9170685a | |
| parent | 9def0c949ab9f4a903ca29f3ad7d0ee04336226d (diff) | |
| download | spectre-meltdown-checker-05c79425ab30b62d424f7502765006127b0990cc.tar.lz spectre-meltdown-checker-05c79425ab30b62d424f7502765006127b0990cc.tar.xz spectre-meltdown-checker-05c79425ab30b62d424f7502765006127b0990cc.zip | |
detect kpti directly in vmlinux if option is not there
| -rwxr-xr-x | spectre-meltdown-checker.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh index 4f80c18..dfa8a63 100755 --- a/spectre-meltdown-checker.sh +++ b/spectre-meltdown-checker.sh @@ -1,7 +1,7 @@ #! /bin/sh # Spectre & Meltdown checker # Stephane Lesimple -VERSION=0.07 +VERSION=0.08 pstatus() { @@ -95,7 +95,6 @@ else pstatus green YES "$nb_lfence opcodes found, which is >= 60" status=2 fi - rm -f $vmlinux fi fi @@ -218,6 +217,14 @@ elif [ -e /boot/System.map-$(uname -r) ]; then else pstatus red NO fi +elif [ -n "$vmlinux" ]; then + # some backports don't have the option but still have the patch, try to find out + if strings "$vmlinux" | grep -qw nopti; then + pstatus green YES + kpti_support=1 + else + pstatus red NO + fi else pstatus yellow UNKNOWN "couldn't read your kernel configuration" fi @@ -226,7 +233,7 @@ fi if grep ^flags /proc/cpuinfo | grep -qw pti; then pstatus green YES kpti_enabled=1 -elif dmesg | grep -q 'Kernel/User page tables isolation: enabled'; then +elif dmesg | grep -Eq 'Kernel/User page tables isolation: enabled|Kernel page table isolation enabled'; then pstatus green YES kpti_enabled=1 else @@ -249,3 +256,5 @@ if [ "$USER" != root ]; then /bin/echo "You can try the following command: sudo $0" fi +[ -n "$vmlinux" ] && rm -f "$vmlinux" + |