smp/urgent fixes

Linus,

Please pull the latest smp-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git smp-urgent-for-linus

# HEAD: 33d4a5a7a5b4d02915d765064b2319e90a11cbde cpu/hotplug: Fix out-of-bounds read when setting fail state

Two fixes:

- Fix an out of bounds access when writing nonsensical values to /sys/devices/system/cpu/cpuX/hotplug/fail

- Warn about unsupported mitigations= parameters.

Thanks,

Ingo

------------------>
Eiichi Tsukata (1):
cpu/hotplug: Fix out-of-bounds read when setting fail state

Geert Uytterhoeven (1):
cpu/speculation: Warn on unsupported mitigations= parameter

 kernel/cpu.c | 6 ++++++
 1 file changed, 6 insertions(+)

index 077fde6fb953..ef1c565edc5d 100644
@@ -1964,6 +1964,9 @@ static ssize_t write_cpuhp_fail(struct device *dev,
 	if (ret)
 		return ret;
 
+	if (fail < CPUHP_OFFLINE || fail > CPUHP_ONLINE)
+		return -EINVAL;
+
 	/*
 	 * Cannot fail STARTING/DYING callbacks.
 	 */

@@ -2339,6 +2342,9 @@ static int __init mitigations_parse_cmdline(char *arg)
 		cpu_mitigations = CPU_MITIGATIONS_AUTO;
 	else if (!strcmp(arg, "auto,nosmt"))
 		cpu_mitigations = CPU_MITIGATIONS_AUTO_NOSMT;
+	else
+		pr_crit("Unsupported mitigations=%s, system may still be vulnerable\n",
+			arg);
 
 	return 0;
 }

Linus, please ignore this duplicate pull request. I thought Thomas didn't send this one yet, but he has a few hours ago but the Cc: to me was buggy so I didn't notice it at first. :-/

Thanks,

Ingo