* [PATCH] vboxsf: Replace all non-returning strlcpy with strscpy
@ 2023-05-10 21:11 Azeem Shaikh
2023-05-11 8:22 ` Hans de Goede
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Azeem Shaikh @ 2023-05-10 21:11 UTC (permalink / raw)
To: Hans de Goede; +Cc: linux-hardening, Azeem Shaikh, linux-fsdevel, linux-kernel
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>
---
fs/vboxsf/super.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/vboxsf/super.c b/fs/vboxsf/super.c
index d2f6df69f611..1fb8f4df60cb 100644
--- a/fs/vboxsf/super.c
+++ b/fs/vboxsf/super.c
@@ -176,7 +176,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc)
}
folder_name->size = size;
folder_name->length = size - 1;
- strlcpy(folder_name->string.utf8, fc->source, size);
+ strscpy(folder_name->string.utf8, fc->source, size);
err = vboxsf_map_folder(folder_name, &sbi->root);
kfree(folder_name);
if (err) {
--
2.40.1.521.gf1e218fcd8-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] vboxsf: Replace all non-returning strlcpy with strscpy
2023-05-10 21:11 [PATCH] vboxsf: Replace all non-returning strlcpy with strscpy Azeem Shaikh
@ 2023-05-11 8:22 ` Hans de Goede
2023-05-11 16:21 ` Kees Cook
2023-05-22 19:39 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Hans de Goede @ 2023-05-11 8:22 UTC (permalink / raw)
To: Azeem Shaikh; +Cc: linux-hardening, linux-fsdevel, linux-kernel
Hi,
On 5/10/23 23:11, Azeem Shaikh wrote:
> 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>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> fs/vboxsf/super.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/vboxsf/super.c b/fs/vboxsf/super.c
> index d2f6df69f611..1fb8f4df60cb 100644
> --- a/fs/vboxsf/super.c
> +++ b/fs/vboxsf/super.c
> @@ -176,7 +176,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc)
> }
> folder_name->size = size;
> folder_name->length = size - 1;
> - strlcpy(folder_name->string.utf8, fc->source, size);
> + strscpy(folder_name->string.utf8, fc->source, size);
> err = vboxsf_map_folder(folder_name, &sbi->root);
> kfree(folder_name);
> if (err) {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] vboxsf: Replace all non-returning strlcpy with strscpy
2023-05-10 21:11 [PATCH] vboxsf: Replace all non-returning strlcpy with strscpy Azeem Shaikh
2023-05-11 8:22 ` Hans de Goede
@ 2023-05-11 16:21 ` Kees Cook
2023-05-22 19:39 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2023-05-11 16:21 UTC (permalink / raw)
To: Azeem Shaikh; +Cc: Hans de Goede, linux-hardening, linux-fsdevel, linux-kernel
On Wed, May 10, 2023 at 09:11:46PM +0000, Azeem Shaikh wrote:
> 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>
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] vboxsf: Replace all non-returning strlcpy with strscpy
2023-05-10 21:11 [PATCH] vboxsf: Replace all non-returning strlcpy with strscpy Azeem Shaikh
2023-05-11 8:22 ` Hans de Goede
2023-05-11 16:21 ` Kees Cook
@ 2023-05-22 19:39 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2023-05-22 19:39 UTC (permalink / raw)
To: hdegoede, azeemshaikh38
Cc: Kees Cook, linux-kernel, linux-hardening, linux-fsdevel
On Wed, 10 May 2023 21:11:46 +0000, Azeem Shaikh wrote:
> 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.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] vboxsf: Replace all non-returning strlcpy with strscpy
https://git.kernel.org/kees/c/883f8fe87686
--
Kees Cook
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-22 19:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-10 21:11 [PATCH] vboxsf: Replace all non-returning strlcpy with strscpy Azeem Shaikh
2023-05-11 8:22 ` Hans de Goede
2023-05-11 16:21 ` Kees Cook
2023-05-22 19:39 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).