Skip to contentSkip to conversation

xfs: introduce protection for drop nlink

PATCH Superseded [email protected] 2 participants 2 messages Oct 9, 2023 XFS filesystem

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 xfs: introduce protection for drop nlink

From: Cheng Lin <[email protected]> When abnormal drop_nlink are detected on the inode, return error, to avoid corruption propagation.

---
 fs/xfs/xfs_inode.c | 8 ++++++++
 1 file changed, 8 insertions(+)
fs/xfs/xfs_inode.c +8 -0
index 9e62cc500..752e6aeba 100644
@@ -919,6 +919,14 @@ xfs_droplink(
 	xfs_trans_t *tp,
 	xfs_inode_t *ip)
 {
+
+	if (VFS_I(ip)->i_nlink == 0) {
+		xfs_alert(ip->i_mount,
+			  "%s: Attempt to drop inode (%llu) with nlink zero.",
+			  __func__, ip->i_ino);
+		return -EFSCORRUPTED;
+	}
+
 	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
 
 	drop_nlink(VFS_I(ip));
Signature · 1 line
2.18.1
Reviewed-by on v5 1/1
#1 lore raw
Quoted 14 lines · On Mon, Oct 09, 2023 at 04:45:57PM +0800, [email protected] wrote:

From: Cheng Lin <[email protected]> When abnormal drop_nlink are detected on the inode, return error, to avoid corruption propagation.

---
 fs/xfs/xfs_inode.c | 8 ++++++++
 1 file changed, 8 insertions(+)
fs/xfs/xfs_inode.c +0 -0
index 9e62cc500..752e6aeba 100644

fs/xfs/xfs_inode.c xfs_droplink( · line 922

Quoted 4 lines
fs/xfs/xfs_inode.c +1 -0
@@ -919,6 +919,14 @@ xfs_droplink(
 	xfs_trans_t *tp,
 	xfs_inode_t *ip)
 {
+

No need for the extra whitespace here.

fs/xfs/xfs_inode.c xfs_droplink( · line 928

Quoted 6 lines
fs/xfs/xfs_inode.c +6 -0
+	if (VFS_I(ip)->i_nlink == 0) {
+		xfs_alert(ip->i_mount,
+			  "%s: Attempt to drop inode (%llu) with nlink zero.",
+			  __func__, ip->i_ino);
+		return -EFSCORRUPTED;
+	}

With that fixed,

--D

Quoted 6 lines
fs/xfs/xfs_inode.c +1 -0
+
 	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
 
 	drop_nlink(VFS_I(ip));
Signature · 1 line
2.18.1