Commit b6bb9676 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu update from Greg Ungerer:
 "Only a single change to use the safer strscpy() instead of strncpy()
  when setting up the cmdline"

* tag 'm68knommu-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: use strscpy() to instead of strncpy()
parents 32d528c4 af5d74e3

arch/m68k/kernel/setup_no.c

+1 −2
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ void __init setup_arch(char **cmdline_p) 
	config_BSP(&command_line[0], sizeof(command_line));



#if defined(CONFIG_BOOTPARAM)

	strncpy(&command_line[0], CONFIG_BOOTPARAM_STRING, sizeof(command_line));

	command_line[sizeof(command_line) - 1] = 0;

	strscpy(&command_line[0], CONFIG_BOOTPARAM_STRING, sizeof(command_line));

#endif /* CONFIG_BOOTPARAM */



	process_uboot_commandline(&command_line[0], sizeof(command_line));