Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

sh: Replace all non-returning strlcpy with strscpy

Browse Source 
strlcpy() reads the entire source buffer first.
This read may exceed the destination size limit.
This is both inefficient and can lead to linear read
overflows if a source string is not NUL-terminated [1].
In an effort to remove strlcpy() completely [2], replace
strlcpy() here with strscpy().
No return values were used, so direct replacement is safe.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89

Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230530163041.985456-1-azeemshaikh38@gmail.com
This commit is contained in:
Azeem Shaikh 2023-05-30 16:30:41 +00:00 committed by Kees Cook
parent fdd932efae
commit 870410910b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/drivers/dma/dma-api.c
View File

@ -198,7 +198,7 @@ int request_dma(unsigned int chan, const char *dev_id)
if (atomic_xchg(&channel->busy, 1)) if (atomic_xchg(&channel->busy, 1))
return -EBUSY; return -EBUSY;
strlcpy(channel->dev_id, dev_id, sizeof(channel->dev_id)); strscpy(channel->dev_id, dev_id, sizeof(channel->dev_id));
if (info->ops->request) { if (info->ops->request) {
result = info->ops->request(channel); result = info->ops->request(channel);

4
arch/sh/kernel/setup.c
View File

@ -304,9 +304,9 @@ void __init setup_arch(char **cmdline_p)
bss_resource.end = virt_to_phys(__bss_stop)-1; bss_resource.end = virt_to_phys(__bss_stop)-1;
#ifdef CONFIG_CMDLINE_OVERWRITE #ifdef CONFIG_CMDLINE_OVERWRITE
strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line)); strscpy(command_line, CONFIG_CMDLINE, sizeof(command_line));
#else #else
strlcpy(command_line, COMMAND_LINE, sizeof(command_line)); strscpy(command_line, COMMAND_LINE, sizeof(command_line));
#ifdef CONFIG_CMDLINE_EXTEND #ifdef CONFIG_CMDLINE_EXTEND
strlcat(command_line, " ", sizeof(command_line)); strlcat(command_line, " ", sizeof(command_line));
strlcat(command_line, CONFIG_CMDLINE, sizeof(command_line)); strlcat(command_line, CONFIG_CMDLINE, sizeof(command_line));