fix MSR reading, need rdmsr for now

spectre-meltdown-checker.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Spectre & Meltdown checker
 # Stephane Lesimple
-VERSION=0.02
+VERSION=0.05
 
 pstatus()
 {
@@ -11,7 +11,7 @@ pstatus()
 		yellow) col="\033[103m\033[30m";;
 		*)      col="";;
 	esac
-	/bin/echo -ne "$col$2\033[0m"
+	/bin/echo -ne "$col $2 \033[0m"
 	[ -n "$3" ] && /bin/echo -n " ($3)"
 	/bin/echo
 }
@@ -73,22 +73,30 @@ extract_vmlinux()
 /bin/echo -e "\033[1;34mCVE-2017-5753 [bounds check bypass] aka 'Spectre Variant 1'\033[0m"
 /bin/echo -n "* Kernel compiled with LFENCE opcode inserted at the proper places: "
 
-vmlinux=$(extract_vmlinux /boot/vmlinuz-4.4.110)
 status=0
-if [ -z "$vmlinux" -o ! -r "$vmlinux" ]; then
+img=''
-	pstatus yellow UNKNOWN "couldn't extract your kernel"
+[ -e /boot/vmlinuz-$(uname -r) ] && img=/boot/vmlinuz-$(uname -r)
-elif ! which objdump >/dev/null 2>&1; then
+[ -e /boot/vmlinux-$(uname -r) ] && img=/boot/vmlinux-$(uname -r)
-	pstatus yellow UNKNOWN "missing 'objdump' tool, please install it, usually it's in the binutils package"
+[ -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"
 else
-	nb_lfence=$(objdump -D "$vmlinux" | grep -wc lfence)
+	vmlinux=$(extract_vmlinux $img)
-	if [ "$nb_lfence" -lt 60 ]; then
+	if [ -z "$vmlinux" -o ! -r "$vmlinux" ]; then
-		pstatus red NO "only $nb_lfence opcodes found, should be >= 60"
+		pstatus yellow UNKNOWN "couldn't extract your kernel"
-		status=1
+	elif ! which objdump >/dev/null 2>&1; then
+		pstatus yellow UNKNOWN "missing 'objdump' tool, please install it, usually it's in the binutils package"
 	else
-		pstatus green YES "$nb_lfence opcodes found, which is >= 60"
+		nb_lfence=$(objdump -D "$vmlinux" | grep -wc lfence)
-		status=2
+		if [ "$nb_lfence" -lt 60 ]; then
+			pstatus red NO "only $nb_lfence opcodes found, should be >= 60"
+			status=1
+		else
+			pstatus green YES "$nb_lfence opcodes found, which is >= 60"
+			status=2
+		fi
+		rm -f $vmlinux
 	fi
-	rm -f $vmlinux
 fi
 
 /bin/echo -ne "> \033[46m\033[30mSTATUS:\033[0m "
@@ -108,14 +116,23 @@ fi
 if [ ! -e /dev/cpu/0/msr ]; then
 	pstatus yellow UNKNOWN "couldn't read /dev/cpu/0/msr, is msr support enabled in your kernel?"
 else
-	dd if=/dev/cpu/0/msr of=/dev/null bs=1 count=8 skip=72 2>/dev/null
+	if which rdmsr >/dev/null 2>&1; then
-	if [ $? -eq 0 ]; then
+		rdmsr 0x48 >/dev/null 2>&1
-		pstatus green YES
+		if [ $? -eq 0 ]; then
+			pstatus green YES
+		else
+			pstatus red NO
+		fi
 	else
-		pstatus red NO
+		pstatus yellow UNKNOWN "missing 'rdmsr' tool, please install it, usually it's in the msr-tools package"
+		# doesn't work:
+		#dd if=/dev/cpu/0/msr of=/dev/null bs=1 count=8 skip=72 2>/dev/null
+		#if [ $? -eq 0 ]; then
+		#	pstatus green YES
+		#else
+		#	pstatus red NO
+		#fi
 	fi
-	#dd if=/dev/cpu/0/msr of=/dev/null bs=1 count=8 skip=73 2>/dev/null
-	#/bin/echo $?
 fi
 
 if [ "$insmod_msr" = 1 ]; then
@@ -156,15 +173,32 @@ fi
 
 /bin/echo "* Mitigation 2"
 /bin/echo -n "*   Kernel recompiled with retpolines: "
-pstatus yellow UNKNOWN "check not yet implemented"
+# XXX this doesn't mean the kernel has been compiled with a retpoline-aware gcc
+if [ -e /proc/config.gz ]; then
+	if zgrep -q '^CONFIG_RETPOLINE=y' /proc/config.gz; then
+		pstatus green YES
+		retpoline=1
+	else
+		pstatus red NO
+	fi
+elif [ -e /boot/config-$(uname -r) ]; then
+	if grep  -q '^CONFIG_RETPOLINE=y' /boot/config-$(uname -r); then
+		pstatus green YES
+		retpoline=1
+	else
+		pstatus red NO
+	fi
+fi
 
 /bin/echo -ne "> \033[46m\033[30mSTATUS:\033[0m "
 if grep -q AMD /proc/cpuinfo; then
 	pstatus green "NOT VULNERABLE" "your CPU is not vulnerable as per the vendor"
 elif [ "$ibrs_enabled" = 1 -o "$ibrs_enabled" = 2 ]; then
 	pstatus green "NOT VULNERABLE" "IBRS mitigates the vulnerability"
+elif [ "$retpoline" = 1 ]; then
+	pstatus green "NOT VULNERABLE" "retpolines mitigate the vulnerability"
 else
-	pstatus red VULNERABLE "IBRS hardware + kernel support OR retpolines-compiled kernel are needed to mitigate the vulnerability"
+	pstatus red VULNERABLE "IBRS hardware + kernel support OR kernel with retpolines are needed to mitigate the vulnerability"
 fi
 
 # MELTDOWN