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

Commit b15593e2 authored by Wenlin Kang's avatar Wenlin Kang Committed by Greg Kroah-Hartman
Browse files

kdb: Fix bound check compiler warning 



[ Upstream commit ca976bfb3154c7bc67c4651ecd144fdf67ccaee7 ]

The strncpy() function may leave the destination string buffer
unterminated, better use strscpy() instead.

This fixes the following warning with gcc 8.2:

kernel/debug/kdb/kdb_io.c: In function 'kdb_getstr':
kernel/debug/kdb/kdb_io.c:449:3: warning: 'strncpy' specified bound 256 equals destination size [-Wstringop-truncation]
   strncpy(kdb_prompt_str, prompt, CMD_BUFLEN);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: default avatarWenlin Kang <wenlin.kang@windriver.com>
Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Stable-dep-of: 70867efacf43 ("kdb: address -Wformat-security warnings")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 19cce462

kernel/debug/kdb/kdb_io.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static char *kdb_read(char *buffer, size_t bufsize) 
char *kdb_getstr(char *buffer, size_t bufsize, const char *prompt)

{

	if (prompt && kdb_prompt_str != prompt)

		strncpy(kdb_prompt_str, prompt, CMD_BUFLEN);

		strscpy(kdb_prompt_str, prompt, CMD_BUFLEN);

	kdb_printf(kdb_prompt_str);

	kdb_nextline = 1;	/* Prompt and input resets line number */

	return kdb_read(buffer, bufsize);