On Mon, Sep 02, 2024 at 04:52:30PM +0800, Gao Xiang wrote: > > > On 2024/9/2 16:31, Yiyang Wu wrote: > > Remove open coding in erofs_fill_symlink. > > > > Suggested-by: Al Viro <[email protected]> > > Link: https://lore.kernel.org/all/20240425222847.GN2118490@ZenIV > > Signed-off-by: Yiyang Wu <[email protected]> > > If a patch is unchanged, you have two ways to handle: > - resend the patch with new received "Reviewed-by"; > - just send the updated [PATCH 2/2] with new version > and `--in-reply-to=<old message id>`. > > I will apply this patch first.
I applied this patch as >From b3c5375ceb2944a7e4d34a6fb106ecd4614260d7 Mon Sep 17 00:00:00 2001 From: Yiyang Wu <[email protected]> Date: Mon, 2 Sep 2024 16:31:46 +0800 Subject: erofs: use kmemdup_nul in erofs_fill_symlink Remove open coding in erofs_fill_symlink. Suggested-by: Al Viro <[email protected]> Link: https://lore.kernel.org/all/20240425222847.GN2118490@ZenIV Signed-off-by: Yiyang Wu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Gao Xiang <[email protected]> Signed-off-by: Gao Xiang <[email protected]> --- fs/erofs/inode.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index 82259553d9f641..68ea67e0caf33a 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -179,7 +179,6 @@ static int erofs_fill_symlink(struct inode *inode, void *kaddr, { struct erofs_inode *vi = EROFS_I(inode); unsigned int bsz = i_blocksize(inode); - char *lnk; /* if it cannot be handled with fast symlink scheme */ if (vi->datalayout != EROFS_INODE_FLAT_INLINE || @@ -188,24 +187,18 @@ static int erofs_fill_symlink(struct inode *inode, void *kaddr, return 0; } - lnk = kmalloc(inode->i_size + 1, GFP_KERNEL); - if (!lnk) - return -ENOMEM; - m_pofs += vi->xattr_isize; /* inline symlink data shouldn't cross block boundary */ if (m_pofs + inode->i_size > bsz) { - kfree(lnk); - erofs_err(inode->i_sb, - "inline data cross block boundary @ nid %llu", + erofs_err(inode->i_sb, "inline data cross block boundary @ nid %llu", vi->nid); DBG_BUGON(1); return -EFSCORRUPTED; } - memcpy(lnk, kaddr + m_pofs, inode->i_size); - lnk[inode->i_size] = '\0'; - inode->i_link = lnk; + inode->i_link = kmemdup_nul(kaddr + m_pofs, inode->i_size, GFP_KERNEL); + if (!inode->i_link) + return -ENOMEM; inode->i_op = &erofs_fast_symlink_iops; return 0; } To fix a redundant tab and a blank line. Thanks, Gao Xiang
