[PATCH 2/2] erofs: use kmemdup_nul in erofs_fill_symlink
Yiyang Wu
toolmanp at tlmp.cc
Mon Sep 2 14:51:00 AEST 2024
Remove open coding in erofs_fill_symlink.
Suggested-by: Al Viro <viro at zeniv.linux.org.uk>
Link: https://lore.kernel.org/all/20240425222847.GN2118490@ZenIV
Signed-off-by: Yiyang Wu <toolmanp at tlmp.cc>
---
fs/erofs/inode.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index 90f1235dc404..f435752143cb 100644
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -21,23 +21,20 @@ 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",
vi->nid);
DBG_BUGON(1);
return -EFSCORRUPTED;
}
- memcpy(lnk, kaddr + m_pofs, inode->i_size);
- lnk[inode->i_size] = '\0';
+ lnk = kmemdup_nul(kaddr+m_pofs, inode->i_size, GFP_KERNEL);
+ if (!lnk)
+ return -ENOMEM;
inode->i_link = lnk;
return 0;
}
--
2.46.0
More information about the Linux-erofs
mailing list