From 7ae2dfe35af58307b8e6461633a6a320c67efb55 Mon Sep 17 00:00:00 2001
From: rrobgill <35944068+rrobgill@users.noreply.github.com>
Date: Mon, 7 May 2018 10:08:21 +1000
Subject: [PATCH] Update spectre-meltdown-checker.sh

Check after checking ibrs_enabled
---
 spectre-meltdown-checker.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh
index e57ac58..6cfb1b8 100755
--- a/spectre-meltdown-checker.sh
+++ b/spectre-meltdown-checker.sh
@@ -2121,10 +2121,6 @@ check_variant2_linux()
 			if [ "$ibpb_enabled" = 2 ]; then
 				# if ibpb=2, ibrs is forcefully=0
 				pstatus blue NO "IBPB used instead of IBRS in all kernel entrypoints"
-			else
-			if [ ! "$cpuid_ibrs" = 'SPEC_CTRL' ] && [ ! "cpuid_ibrs" = 'IBRS_SUPPORT' ] && [ ! "cpuid_spec_ctrl" = -1 ]; then 
-				pstatus yellow NO; 
-				_debug "ibrs: known cpu not supporting SPEC-CTRL or IBRS"; 
 			else
 				# 0 means disabled
 				# 1 is enabled only for kernel space
@@ -2141,10 +2137,12 @@ check_variant2_linux()
 					1)	if [ "$ibrs_fw_enabled" = 1 ]; then pstatus green YES "for kernel space and firmware code"; else pstatus green YES "for kernel space"; fi;;
 					2)	if [ "$ibrs_fw_enabled" = 1 ]; then pstatus green YES "for kernel, user space, and firmware code" ; else pstatus green YES "for both kernel and user space"; fi;;
 					3)	if [ "$ibrs_fw_enabled" = 1 ]; then pstatus green YES "for kernel and firmware code"; else pstatus green YES; fi;;
-					*)	pstatus yellow UNKNOWN;;
+					*)	if [ ! "$cpuid_ibrs" = 'SPEC_CTRL' ] && [ ! "cpuid_ibrs" = 'IBRS_SUPPORT' ] && [ ! "cpuid_spec_ctrl" = -1 ]; 
+							then pstatus yellow NO; _debug "ibrs: known cpu not supporting SPEC-CTRL or IBRS"; 
+						else 
+							pstatus yellow UNKNOWN; fi;;
 				esac
 			fi
-			fi
 		else
 			pstatus blue N/A "not testable in offline mode"
 		fi