lkml.org 
[lkml]   [2022]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/14] befs: move from strlcpy with unused retval to strscpy
    Date
    Follow the advice of the below link and prefer 'strscpy' in this
    subsystem. Conversion is 1:1 because the return value is not used.
    Generated by a coccinelle script.

    Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
    Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.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;
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-08-18 23:12    [W:3.660 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site