X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finitscripts%2Fsystem%2Fsmt;h=f85f567fa878662965d784f3418a4366ee2a0f93;hb=0bb25a4f61e494a8118bfb764625cd98fe209438;hp=a31cd7beabda906c79a6ebaa8757b6c8a50e91dd;hpb=cfbb61a74d4729acbbc21df6488023e3e07a1408;p=people%2Famarx%2Fipfire-2.x.git

diff --git a/src/initscripts/system/smt b/src/initscripts/system/smt
index a31cd7bea..f85f567fa 100644
--- a/src/initscripts/system/smt
+++ b/src/initscripts/system/smt
@@ -15,20 +15,24 @@ case "${1}" in
 			exit 0
 		fi
 
-		# Nothing to do if this processor is not vulnerable
-		# to Fallout/RIDL.
-		if [ -r "/sys/devices/system/cpu/vulnerabilities/mds" ]; then
-			if [ "$(</sys/devices/system/cpu/vulnerabilities/mds)" = "Not affected" ]; then
-				exit 0
-			fi
+		# Nothing to do when SMT is not enabled or not supported anyways
+		if [ "$(</sys/devices/system/cpu/smt/control)" != "on" ]; then
+			exit 0
+		fi
 
-			# Disable SMT when supported and enabled
-			if [ "$(</sys/devices/system/cpu/smt/control)" = "on" ]; then
+		# Disable SMT when the processor is vulnerable to Foreshadow or Fallout/ZombieLoad/RIDL
+		for vuln in l1tf mds; do
+			if [ -r "/sys/devices/system/cpu/vulnerabilities/${vuln}" ] && \
+					[ "$(</sys/devices/system/cpu/vulnerabilities/${vuln})" != "Not affected" ]; then
+				# Disable SMT
 				boot_mesg "Disabling Simultaneous Multi-Threading (SMT)..."
 				echo "forceoff" > /sys/devices/system/cpu/smt/control
 				echo_ok
+
+				# No need to check any further when we have disabled SMT already
+				break
 			fi
-		fi
+		done
 		;;
 
 	*)