From cc224c052215afedeb62fb4b5d986a512e68fc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= <speed47_github@speed47.net>
Date: Sat, 21 Sep 2019 18:50:08 +0200
Subject: [PATCH] fix: mocking value for read_msr

we were returning the mocking value before actually setting it.
also remove spaces around the returned value (no behavior change)
---
 spectre-meltdown-checker.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh
index 5409004..da00bf2 100755
--- a/spectre-meltdown-checker.sh
+++ b/spectre-meltdown-checker.sh
@@ -2071,8 +2071,6 @@ read_msr()
 		_debug "read_msr: MOCKING enabled for msr $_msr, returning $read_msr_value"
 		mocked=1
 		return 0
-	else
-		mockme=$(printf "%b\n%b" "$mockme" "SMC_MOCK_RDMSR_${_msr}='$read_msr_value'")
 	fi
 
 	_mockvarname="SMC_MOCK_RDMSR_${_msr}_RET"
@@ -2121,7 +2119,10 @@ read_msr()
 			mockme=$(printf "%b\n%b" "$mockme" "SMC_MOCK_RDMSR_${_msr}_RET=1")
 			return 1
 		fi
+	# remove sparse spaces od might give us
+	read_msr_value=$(( read_msr_value ))
 	fi
+	mockme=$(printf "%b\n%b" "$mockme" "SMC_MOCK_RDMSR_${_msr}='$read_msr_value'")
 	_debug "read_msr: MSR=$_msr value is $read_msr_value"
 	return 0
 }