x86/boot: validate console=uart8250 baud rate to avoid early boot hang
Subsystems (2)
PATCH 1/1 x86/boot: validate console=uart8250 baud rate to avoid early boot hang
When the baud rate is empty, 0, invalid, or overflows to 0 when stored as an int, the system will hang during early boot because of a division by zero in early_serial_init().
Fall back to DEFAULT_BAUD when the resulting baud rate is 0 to prevent an early system hang.
--- arch/x86/boot/early_serial_console.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/x86/boot/early_serial_console.c +6 -4
@@ -117,7 +117,7 @@ static unsigned int probe_baud(int port)static void parse_console_uart8250 (void ) {char optstr[64 ], *options; -int baud =DEFAULT_BAUD ; +int baud;int port =0 ;/*
@@ -136,9 +136,11 @@ static void parse_console_uart8250(void)else return ; -if (options && (options[0 ] ==',' )) - baud =simple_strtoull (options +1 , &options,0 ); -else +if (options && (options[0 ] ==',' )) { + baud =simple_strtoull (options +1 ,NULL ,0 ); +if (!baud) + baud =DEFAULT_BAUD ; + }else baud =probe_baud (port);if (port)
Quoted 32 lines · Thorsten Blum
When the baud rate is empty, 0, invalid, or overflows to 0 when stored as an int, the system will hang during early boot because of a division by zero in
early_serial_init().Fall back to
DEFAULT_BAUDwhen the resulting baud rate is 0 to prevent an early system hang.Fixes ce0aa5dd20e4 ("x86, setup: Make the setup code also accept console=uart8250")Signed-off-by Thorsten Blum <[email protected]>--- arch/x86/boot/early_serial_console.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)arch/x86/boot/early_serial_console.c +1
-2@@ -117,7 +117,7 @@ static unsigned int probe_baud(int port)static void parse_console_uart8250 (void ) {char optstr[64 ], *options; -int baud =DEFAULT_BAUD ; +int baud;int port =0 ;/* @@ -136,9 +136,11 @@ static void parse_console_uart8250(void)else return ; -if (options && (options[0 ] ==',' ))
arch/x86/boot/early_serial_console.c static void parse_console_uart8250(void) · line 146
Quoted 10 lines
arch/x86/boot/early_serial_console.c +5
-2- baud =simple_strtoull (options +1 , &options,0 ); - else +if (options && (options[0 ] ==',' )) { + baud =simple_strtoull (options +1 ,NULL ,0 ); +if (!baud) + baud =DEFAULT_BAUD ; + }else baud =probe_baud (port);if (port)
Gentle ping?
I also tested this and verified that it works.