parisc: Use safer strscpy() in setup_cmdline()
Helge Deller
maintainerPATCH 1/2 parisc: Use safer strscpy() in setup_cmdline()
--- arch/parisc/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/parisc/kernel/setup.c +2 -2
@@ -56,7 +56,7 @@ void __init setup_cmdline(char **cmdline_p)/* called from hpux boot loader */ boot_command_line[0 ] ='\0' ; }else { -strlcpy (boot_command_line, (char *)__va (boot_args[1 ]), +strscpy (boot_command_line, (char *)__va (boot_args[1 ]),COMMAND_LINE_SIZE );#ifdef CONFIG_BLK_DEV_INITRD
@@ -68,7 +68,7 @@ void __init setup_cmdline(char **cmdline_p)#endif } -strcpy (command_line, boot_command_line); +strscpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line; }
--
2.31.1
Helge Deller
maintainerPATCH 2/2 parisc: Autodetect default output device and set console= kernel parameter
Usually palo (the PA-RISC boot loader) will check at boot time if the machine/firmware was configured to use the serial line (ttyS0, SERIAL_x) or the graphical display (tty0, graph) as default output device and add the correct "console=ttyS0" or "console=tty0" Linux kernel parameter to the kernel command line when starting the Linux kernel.
But the kernel could also have been started via the HP-UX boot loader or directly in qemu, in which cases the console parameter is missing.
This patch fixes this problem by adding the correct console= parameter if it's missing in the current kernel command line.
--- arch/parisc/kernel/setup.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/parisc/kernel/setup.c +11 -0
@@ -48,6 +48,7 @@ struct proc_dir_entry * proc_mckinley_root __read_mostly = NULL;void __init setup_cmdline (char **cmdline_p) {extern unsigned int boot_args[]; +char *p;/* Collect stuff passed in from the boot loader */
@@ -59,6 +60,16 @@ void __init setup_cmdline(char **cmdline_p)strscpy (boot_command_line, (char *)__va (boot_args[1 ]),COMMAND_LINE_SIZE ); +/* autodetect console type (if not done by palo yet) */ + p = boot_command_line; +if (!str_has_prefix (p,"console=" ) && !strstr (p," console=" )) { +strlcat (p," console=" ,COMMAND_LINE_SIZE ); +if (PAGE0 ->mem_cons.cl_class ==CL_DUPLEX ) +strlcat (p,"ttyS0" ,COMMAND_LINE_SIZE ); +else +strlcat (p,"tty0" ,COMMAND_LINE_SIZE ); + } +#ifdef CONFIG_BLK_DEV_INITRD if (boot_args[2 ] !=0 )/* did palo pass us a ramdisk? */ {
--
2.31.1