]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
erofs: use kmemdup_nul in erofs_fill_symlink
authorYiyang Wu <toolmanp@tlmp.cc>
Mon, 2 Sep 2024 08:31:46 +0000 (16:31 +0800)
committerGao Xiang <hsiangkao@linux.alibaba.com>
Tue, 10 Sep 2024 07:27:11 +0000 (15:27 +0800)
Remove open coding in erofs_fill_symlink.

Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/all/20240425222847.GN2118490@ZenIV
Signed-off-by: Yiyang Wu <toolmanp@tlmp.cc>
Link: https://lore.kernel.org/r/20240902083147.450558-2-toolmanp@tlmp.cc
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
fs/erofs/inode.c

index b9d57d42a158f4b3fc6df7ef098b12ad59b3a07c..4ced52b29f5f6c8cd6022b3a2111b853350956c6 100644 (file)
@@ -179,7 +179,6 @@ static int erofs_fill_symlink(struct inode *inode, void *kaddr,
 {
        struct erofs_inode *vi = EROFS_I(inode);
        loff_t off;
-       char *lnk;
 
        m_pofs += vi->xattr_isize;
        /* check if it cannot be handled with fast symlink scheme */
@@ -190,14 +189,9 @@ static int erofs_fill_symlink(struct inode *inode, void *kaddr,
                return 0;
        }
 
-       lnk = kmalloc(inode->i_size + 1, GFP_KERNEL);
-       if (!lnk)
+       inode->i_link = kmemdup_nul(kaddr + m_pofs, inode->i_size, GFP_KERNEL);
+       if (!inode->i_link)
                return -ENOMEM;
-
-       memcpy(lnk, kaddr + m_pofs, inode->i_size);
-       lnk[inode->i_size] = '\0';
-
-       inode->i_link = lnk;
        inode->i_op = &erofs_fast_symlink_iops;
        return 0;
 }