Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70570a64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 

Pull nios2 fix from Ley Foon Tan:
 "Make sure the command line buffer is NUL-terminated"

* tag 'nios2-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: force the string buffer NULL-terminated
parents 8bbe0dec 91d99a72

arch/nios2/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6, 
		dtb_passed = r6;



		if (r7)

			strncpy(cmdline_passed, (char *)r7, COMMAND_LINE_SIZE);

			strlcpy(cmdline_passed, (char *)r7, COMMAND_LINE_SIZE);

	}

#endif
@@ -131,10 +131,10 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6, 


#ifndef CONFIG_CMDLINE_FORCE

	if (cmdline_passed[0])

		strncpy(boot_command_line, cmdline_passed, COMMAND_LINE_SIZE);

		strlcpy(boot_command_line, cmdline_passed, COMMAND_LINE_SIZE);

#ifdef CONFIG_NIOS2_CMDLINE_IGNORE_DTB

	else

		strncpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

		strlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#endif

#endif