[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CADmuW3W9yjZqfCszZvKRGSuPzuriT2gH+3YaPDaUVu=Xvz9+Lg@mail.gmail.com>
Date: Mon, 22 May 2023 12:17:41 -0400
From: Azeem Shaikh <azeemshaikh38@...il.com>
To: keescook@...gle.com, Luis de Bethencourt <luisbg@...nel.org>,
Salah Triki <salah.triki@...il.com>
Cc: linux-kernel@...r.kernel.org
Subject: Re: [PATCH] befs: Replace all non-returning strlcpy with strscpy
Friendly ping.
On Mon, May 8, 2023 at 9:41 PM Azeem Shaikh <azeemshaikh38@...il.com> 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.
> In an effort to remove strlcpy() completely, 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@...il.com>
> ---
> fs/befs/btree.c | 2 +-
> fs/befs/linuxvfs.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/befs/btree.c b/fs/befs/btree.c
> index 1b7e0f7128d6..53b36aa29978 100644
> --- a/fs/befs/btree.c
> +++ b/fs/befs/btree.c
> @@ -500,7 +500,7 @@ befs_btree_read(struct super_block *sb, const befs_data_stream *ds,
> goto error_alloc;
> }
>
> - strlcpy(keybuf, keystart, keylen + 1);
> + strscpy(keybuf, keystart, keylen + 1);
> *value = fs64_to_cpu(sb, valarray[cur_key]);
> *keysize = keylen;
>
> diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
> index 32749fcee090..eee9237386e2 100644
> --- a/fs/befs/linuxvfs.c
> +++ b/fs/befs/linuxvfs.c
> @@ -374,7 +374,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
> if (S_ISLNK(inode->i_mode) && !(befs_ino->i_flags & BEFS_LONG_SYMLINK)){
> inode->i_size = 0;
> inode->i_blocks = befs_sb->block_size / VFS_BLOCK_SIZE;
> - strlcpy(befs_ino->i_data.symlink, raw_inode->data.symlink,
> + strscpy(befs_ino->i_data.symlink, raw_inode->data.symlink,
> BEFS_SYMLINK_LEN);
> } else {
> int num_blks;
>
Powered by blists - more mailing lists