Skip to content

Commit 502c9e9

Browse files
committed
Merge tag 'x86-urgent-2026-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: - Reject too long acpi_rsdp= boot parameter values (Thorsten Blum) - Validate console=uart8250 baud rate to fix early boot hang (Thorsten Blum) - Remove dead Makefile rule (Ethan Nelson-Moore) * tag 'x86-urgent-2026-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Validate console=uart8250 baud rate to fix early boot hang x86/boot: Reject too long acpi_rsdp= values x86/cpu: Remove Makefile rule for removed UMC CPU support
2 parents c6859ee + ffa0aa5 commit 502c9e9

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

arch/x86/boot/compressed/acpi.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,15 @@ static unsigned long get_cmdline_acpi_rsdp(void)
184184
char val[MAX_ADDR_LEN] = { };
185185
int ret;
186186

187-
ret = cmdline_find_option("acpi_rsdp", val, MAX_ADDR_LEN);
187+
ret = cmdline_find_option("acpi_rsdp", val, sizeof(val));
188188
if (ret < 0)
189189
return 0;
190190

191+
if (ret >= sizeof(val)) {
192+
warn("acpi_rsdp= value too long; ignoring");
193+
return 0;
194+
}
195+
191196
if (boot_kstrtoul(val, 16, &addr))
192197
return 0;
193198
#endif

arch/x86/boot/early_serial_console.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static unsigned int probe_baud(int port)
117117
static void parse_console_uart8250(void)
118118
{
119119
char optstr[64], *options;
120-
int baud = DEFAULT_BAUD;
120+
int baud;
121121
int port = 0;
122122

123123
/*
@@ -136,10 +136,13 @@ static void parse_console_uart8250(void)
136136
else
137137
return;
138138

139-
if (options && (options[0] == ','))
140-
baud = simple_strtoull(options + 1, &options, 0);
141-
else
139+
if (options && (options[0] == ',')) {
140+
baud = simple_strtoull(options + 1, NULL, 0);
141+
if (!baud)
142+
baud = DEFAULT_BAUD;
143+
} else {
142144
baud = probe_baud(port);
145+
}
143146

144147
if (port)
145148
early_serial_init(port, baud);

arch/x86/kernel/cpu/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ obj-$(CONFIG_CPU_SUP_HYGON) += hygon.o
4646
obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o
4747
obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
4848
obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
49-
obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
5049
obj-$(CONFIG_CPU_SUP_ZHAOXIN) += zhaoxin.o
5150
obj-$(CONFIG_CPU_SUP_VORTEX_32) += vortex.o
5251

0 commit comments

Comments
 (0)