Unverified Commit adb1f95d authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Palmer Dabbelt
Browse files

riscv: Fix an off-by-one in get_early_cmdline() 



The ending NULL is not taken into account by strncat(), so switch to
strlcat() to correctly compute the size of the available memory when
appending CONFIG_CMDLINE to 'early_cmdline'.

Fixes: 26e7aacb ("riscv: Allow to downgrade paging mode from the command line")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/9f66d2b58c8052d4055e90b8477ee55d9a0914f9.1698564026.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 9b1d9abe

arch/riscv/kernel/pi/cmdline_early.c

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ static char *get_early_cmdline(uintptr_t dtb_pa) 
	if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) ||

	    IS_ENABLED(CONFIG_CMDLINE_FORCE) ||

	    fdt_cmdline_size == 0 /* CONFIG_CMDLINE_FALLBACK */) {

		strncat(early_cmdline, CONFIG_CMDLINE,

			COMMAND_LINE_SIZE - fdt_cmdline_size);

		strlcat(early_cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

	}



	return early_cmdline;