From 3b760822ff36d04a8debbddbfb2c91a78ea28d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= <speed47_github@speed47.net>
Date: Sun, 7 Jan 2018 16:00:01 +0100
Subject: [PATCH] fix echo under some shells

---
 spectre-meltdown-checker.sh | 54 ++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh
index c5cc444..22bab38 100755
--- a/spectre-meltdown-checker.sh
+++ b/spectre-meltdown-checker.sh
@@ -11,27 +11,27 @@ pstatus()
 		yellow) col="\033[103m\033[30m";;
 		*)      col="";;
 	esac
-	echo -n "$col$2\033[0m"
-	[ -n "$3" ] && echo -n " ($3)"
-	echo
+	/bin/echo -ne "$col$2\033[0m"
+	[ -n "$3" ] && /bin/echo -n " ($3)"
+	/bin/echo
 }
 
-echo "Spectre and Meltdown mitigation detection tool v$VERSION"
-echo
+/bin/echo "Spectre and Meltdown mitigation detection tool v$VERSION"
+/bin/echo
 
 # SPECTRE 1
-echo "\033[1;34mCVE-2017-5753 [bounds check bypass] aka 'Spectre Variant 1'\033[0m"
-echo -n "* Kernel recompiled with LFENCE opcode insertion: "
+/bin/echo -e "\033[1;34mCVE-2017-5753 [bounds check bypass] aka 'Spectre Variant 1'\033[0m"
+/bin/echo -n "* Kernel recompiled with LFENCE opcode insertion: "
 pstatus yellow UNKNOWN "check not yet implemented"
-echo -n "> \033[46m\033[30mSTATUS:\033[0m "
+/bin/echo -ne "> \033[46m\033[30mSTATUS:\033[0m "
 pstatus yellow UNKNOWN "not implemented, but real answer is most probably VULNERABLE at this stage"
 
 
 # VARIANT 2
-echo
-echo "\033[1;34mCVE-2017-5715 [branch target injection] aka 'Spectre Variant 2'\033[0m"
-echo "* Mitigation 1"
-echo -n "*   Hardware (CPU microcode) support for mitigation: "
+/bin/echo
+/bin/echo -e "\033[1;34mCVE-2017-5715 [branch target injection] aka 'Spectre Variant 2'\033[0m"
+/bin/echo "* Mitigation 1"
+/bin/echo -n "*   Hardware (CPU microcode) support for mitigation: "
 if [ ! -e /dev/cpu/0/msr ]; then
 	modprobe msr 2>/dev/null && insmod_msr=1
 fi
@@ -45,14 +45,14 @@ else
 		pstatus red NO
 	fi
 	#dd if=/dev/cpu/0/msr of=/dev/null bs=1 count=8 skip=73 2>/dev/null
-	#echo $?
+	#/bin/echo $?
 fi
 
 if [ "$insmod_msr" = 1 ]; then
 	rmmod msr 2>/dev/null
 fi
 
-echo -n "*   Kernel support for IBRS: "
+/bin/echo -n "*   Kernel support for IBRS: "
 if [ -e /sys/kernel/debug/sched_features ]; then
 	mount -t debugfs debugfs /sys/kernel/debug 2>/dev/null && mounted_debugfs=1
 fi
@@ -64,7 +64,7 @@ else
 fi
 
 ibrs_enabled=$(cat /sys/kernel/debug/ibrs_enabled 2>/dev/null)
-echo -n "*   IBRS enabled for Kernel space: "
+/bin/echo -n "*   IBRS enabled for Kernel space: "
 case "$ibrs_enabled" in
 	"") [ "$ibrs_supported" = 1 ] && pstatus yellow UNKNOWN || pstatus red NO;;
 	0)     pstatus red NO;;
@@ -72,7 +72,7 @@ case "$ibrs_enabled" in
 	*)     pstatus yellow UNKNOWN;;
 esac
 
-echo -n "*   IBRS enabled for User space: "
+/bin/echo -n "*   IBRS enabled for User space: "
 case "$ibrs_enabled" in
 	"") [ "$ibrs_supported" = 1 ] && pstatus yellow UNKNOWN || pstatus red NO;;
 	0 | 1) pstatus red NO;;
@@ -84,11 +84,11 @@ if [ "$mounted_debugfs" = 1 ]; then
 	umount /sys/kernel/debug
 fi
 
-echo "* Mitigation 2"
-echo -n "*   Kernel recompiled with retpoline: "
+/bin/echo "* Mitigation 2"
+/bin/echo -n "*   Kernel recompiled with retpoline: "
 pstatus yellow UNKNOWN "check not yet implemented"
 
-echo -n "> \033[46m\033[30mSTATUS:\033[0m "
+/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
@@ -98,9 +98,9 @@ else
 fi
 
 # MELTDOWN
-echo
-echo "\033[1;34mCVE-2017-5754 [rogue data cache load] aka 'Meltdown' aka 'Variant 3'\033[0m"
-echo -n "* Kernel supports Page Table Isolation (PTI): "
+/bin/echo
+/bin/echo -e "\033[1;34mCVE-2017-5754 [rogue data cache load] aka 'Meltdown' aka 'Variant 3'\033[0m"
+/bin/echo -n "* Kernel supports Page Table Isolation (PTI): "
 if [ -e /proc/config.gz ]; then
 	if zgrep -q '^CONFIG_PAGE_TABLE_ISOLATION=y' /proc/config.gz; then
 		pstatus green YES
@@ -126,7 +126,7 @@ else
 	pstatus yellow UNKNOWN
 fi
 
-echo -n "* PTI enabled and active: "
+/bin/echo -n "* PTI enabled and active: "
 if grep ^flags /proc/cpuinfo | grep -qw pti; then
 	pstatus green YES
 	kpti_enabled=1
@@ -137,7 +137,7 @@ else
 	pstatus red NO
 fi
 
-echo -n "> \033[46m\033[30mSTATUS:\033[0m "
+/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 [ "$kpti_enabled" = 1 ]; then
@@ -147,10 +147,10 @@ else
 fi
 
 
-echo
+/bin/echo
 if [ "$USER" != root ]; then
-	echo "Note that you should launch this script with root privileges to get accurate information"
-	echo "You can try the following command: sudo $0"
+	/bin/echo "Note that you should launch this script with root privileges to get accurate information"
+	/bin/echo "You can try the following command: sudo $0"
 fi