diff options
| author | Stéphane Lesimple <speed47_github@speed47.net> | 2018-01-08 12:10:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 12:10:07 +0100 |
| commit | d1498fe03f23e1e19ed98eda3149c132718feefe (patch) | |
| tree | e6d8901e11e9bb44a4421488db7f59a8e84a1376 | |
| parent | 12bdd0e412630d988ed052701337b60943043128 (diff) | |
| parent | 0f50e04dab77d28f7203d39f6ee0551a41abbeb5 (diff) | |
| download | spectre-meltdown-checker-d1498fe03f23e1e19ed98eda3149c132718feefe.tar.lz spectre-meltdown-checker-d1498fe03f23e1e19ed98eda3149c132718feefe.tar.xz spectre-meltdown-checker-d1498fe03f23e1e19ed98eda3149c132718feefe.zip | |
Merge pull request #5 from fccagou/centos
fix(centos): check according to redhat patch.
| -rwxr-xr-x | spectre-meltdown-checker.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh index 042c948..3186c4e 100755 --- a/spectre-meltdown-checker.sh +++ b/spectre-meltdown-checker.sh @@ -165,7 +165,7 @@ if [ -e /sys/kernel/debug/sched_features ]; then # try to mount the debugfs hierarchy ourselves and remember it to umount afterwards mount -t debugfs debugfs /sys/kernel/debug 2>/dev/null && mounted_debugfs=1 fi -if [ -e /sys/kernel/debug/ibrs_enabled ]; then +if [ -e /sys/kernel/debug/ibrs_enabled -o -e /sys/kernel/debug/x86/ibrs_enabled ]; then # if the file is there, we have IBRS compiled-in pstatus green YES ibrs_supported=1 @@ -173,7 +173,7 @@ else pstatus red NO fi -ibrs_enabled=$(cat /sys/kernel/debug/ibrs_enabled 2>/dev/null) +[ -f /sys/kernel/debug/ibrs_enabled ] && ibrs_enabled=$(cat /sys/kernel/debug/ibrs_enabled 2>/dev/null) || ibrs_enabled=$(cat /sys/kernel/debug/x86/ibrs_enabled 2>/dev/null) /bin/echo -n "* IBRS enabled for Kernel space: " # 0 means disabled # 1 is enabled only for kernel space @@ -288,6 +288,9 @@ elif dmesg | grep -Eq 'Kernel/User page tables isolation: enabled|Kernel page ta # if we can't find the flag, grep in dmesg pstatus green YES kpti_enabled=1 +elif [ -e /sys/kernel/debug/x86/pti_enabled -a "$(cat /sys/kernel/debug/x86/pti_enabled)" = 1 ]; then + pstatus green YES + kpti_enabled=1 else pstatus red NO fi |