]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/mtrr: Use kstrtoul() in parse_mtrr_spare_reg()
authorThorsten Blum <thorsten.blum@linux.dev>
Mon, 2 Mar 2026 13:53:40 +0000 (14:53 +0100)
committerBorislav Petkov (AMD) <bp@alien8.de>
Mon, 2 Mar 2026 16:25:31 +0000 (17:25 +0100)
Replace the deprecated simple_strtoul()¹ with kstrtoul() for parsing the early
boot parameter mtrr_spare_reg_nr. simple_strtoul() silently sets
nr_mtrr_spare_reg to 0 for invalid input instead of rejecting it and keeping
the default value.

Return kstrtoul()'s retval directly to propagate parsing failures instead of
treating them as success. Also return -EINVAL when '=' is missing from the
boot parameter and 'arg' is NULL.

  ¹ https://www.kernel.org/doc/html/latest/process/deprecated.html#simple-strtol-simple-strtoll-simple-strtoul-simple-strtoull

  [ bp: Massage commit message. ]

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://patch.msgid.link/20260302135341.3473-2-thorsten.blum@linux.dev
arch/x86/kernel/cpu/mtrr/cleanup.c

index 763534d77f5936c3bc88a97031253e13f5c9c30a..e3eee9ae41414760d04f165746eabfbf19c46ee4 100644 (file)
@@ -437,9 +437,10 @@ static unsigned long nr_mtrr_spare_reg __initdata =
 
 static int __init parse_mtrr_spare_reg(char *arg)
 {
-       if (arg)
-               nr_mtrr_spare_reg = simple_strtoul(arg, NULL, 0);
-       return 0;
+       if (!arg)
+               return -EINVAL;
+
+       return kstrtoul(arg, 0, &nr_mtrr_spare_reg);
 }
 early_param("mtrr_spare_reg_nr", parse_mtrr_spare_reg);