mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joseph Qi <joseph.qi@linux.alibaba.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	Heming Zhao <heming.zhao@suse.com>
Cc: Mark Fasheh <mark@fasheh.com>, Joel Becker <jlbec@evilplan.org>,
	ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org,
	Joseph Qi <joseph.qi@linux.alibaba.com>
Subject: [PATCH v3 31/31] ocfs2: check extent list dinodes in online filecheck
Date: Mon,  9 Nov 2026 20:21:21 +0800	[thread overview]
Message-ID: <20261109122121.21473-32-joseph.qi@linux.alibaba.com> (raw)
In-Reply-To: <20261109122121.21473-1-joseph.qi@linux.alibaba.com>

Wire the extent list guard and its three sub-checks into the filecheck
validator: a zero l_count, an l_count beyond ocfs2_extent_recs_per_inode(),
and an l_next_free_rec beyond l_count.

This brings the filecheck validator to parity with
ocfs2_validate_inode_block() for every dinode check except the inline
xattr one.  ocfs2_validate_inode_xattr() calls ocfs2_error() through its
helpers in xattr.c, so sharing it would mean threading a reporting flag
down into that file; it is deliberately left out.

The l_next_free_rec predicate is already used by the repair path, which
fixes that field, so a repair of it now revalidates cleanly.

Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com>
---
 fs/ocfs2/inode.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 6a7dff8a6a05..8e5f7a240381 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -2204,6 +2204,37 @@ static int ocfs2_filecheck_validate_inode_block(struct super_block *sb,
 		goto bail;
 	}
 
+	if (ocfs2_dinode_has_extents(di)) {
+		struct ocfs2_extent_list *el = &di->id2.i_list;
+		u16 count = le16_to_cpu(el->l_count);
+		u16 next_free = le16_to_cpu(el->l_next_free_rec);
+
+		if (ocfs2_dinode_has_zero_extent_count(di)) {
+			mlog(ML_ERROR,
+			     "Filecheck: invalid dinode #%llu: extent list l_count is zero\n",
+			     (unsigned long long)bh->b_blocknr);
+			rc = -OCFS2_FILECHECK_ERR_INVALIDINO;
+			goto bail;
+		}
+
+		if (ocfs2_dinode_has_oversized_extent_count(sb, di)) {
+			mlog(ML_ERROR,
+			     "Filecheck: invalid dinode #%llu: extent list l_count %u exceeds max %u\n",
+			     (unsigned long long)bh->b_blocknr, count,
+			     ocfs2_extent_recs_per_inode(sb));
+			rc = -OCFS2_FILECHECK_ERR_INVALIDINO;
+			goto bail;
+		}
+
+		if (ocfs2_dinode_has_bad_extent_next_free(di)) {
+			mlog(ML_ERROR,
+			     "Filecheck: invalid dinode #%llu: extent list l_next_free_rec %u exceeds l_count %u\n",
+			     (unsigned long long)bh->b_blocknr, next_free, count);
+			rc = -OCFS2_FILECHECK_ERR_INVALIDINO;
+			goto bail;
+		}
+	}
+
 bail:
 	return rc;
 }
-- 
2.39.3


      parent reply	other threads:[~2026-11-09 12:22 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-09 12:20 [PATCH v3 00/31] ocfs2: split dinode validation into shared predicates Joseph Qi
2026-11-09 12:20 ` [PATCH v3 01/31] ocfs2: exempt orphaned dinodes from the zero nlink check Joseph Qi
2026-11-09 12:20 ` [PATCH v3 02/31] ocfs2: abstract the zero nlink or mode dinode check Joseph Qi
2026-11-09 12:20 ` [PATCH v3 03/31] ocfs2: abstract the dinode i_blkno mismatch check Joseph Qi
2026-11-09 12:20 ` [PATCH v3 04/31] ocfs2: abstract the dinode OCFS2_VALID_FL check Joseph Qi
2026-11-09 12:20 ` [PATCH v3 05/31] ocfs2: abstract the dinode fs_generation mismatch check Joseph Qi
2026-11-09 12:20 ` [PATCH v3 06/31] ocfs2: abstract the dinode suballoc slot checks Joseph Qi
2026-11-09 12:20 ` [PATCH v3 07/31] ocfs2: abstract the dinode suballoc bit check Joseph Qi
2026-11-09 12:20 ` [PATCH v3 08/31] ocfs2: abstract the dinode orphaned slot check Joseph Qi
2026-11-09 12:20 ` [PATCH v3 09/31] ocfs2: abstract the dinode DIO " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 10/31] ocfs2: abstract the inline data dinode guard and cluster check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 11/31] ocfs2: abstract the inline data id_count bound check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 12/31] ocfs2: abstract the inline data i_size " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 13/31] ocfs2: abstract the fast symlink dinode guard and size check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 14/31] ocfs2: abstract the fast symlink NUL-termination check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 15/31] ocfs2: abstract the chain list dinode guard and count check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 16/31] ocfs2: abstract the chain list next free record check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 17/31] ocfs2: abstract the chain list bits per cluster check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 18/31] ocfs2: abstract the dinode refcount location check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 19/31] ocfs2: abstract the zero extent list count check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 20/31] ocfs2: abstract the oversized " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 21/31] ocfs2: abstract the extent list next free record check Joseph Qi
2026-11-09 12:21 ` [PATCH v3 22/31] ocfs2: report unrepairable corruption from online filecheck fix Joseph Qi
2026-11-09 12:21 ` [PATCH v3 23/31] ocfs2: check dinode nlink and mode in online filecheck Joseph Qi
2026-11-09 12:21 ` [PATCH v3 24/31] ocfs2: check dinode suballoc slot " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 25/31] ocfs2: check dinode suballoc bit " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 26/31] ocfs2: check dinode orphaned slots " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 27/31] ocfs2: check inline data dinodes " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 28/31] ocfs2: check fast symlink " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 29/31] ocfs2: check chain list " Joseph Qi
2026-11-09 12:21 ` [PATCH v3 30/31] ocfs2: check dinode refcount location " Joseph Qi
2026-11-09 12:21 ` Joseph Qi [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261109122121.21473-32-joseph.qi@linux.alibaba.com \
    --to=joseph.qi@linux.alibaba.com \
    --cc=akpm@linux-foundation.org \
    --cc=heming.zhao@suse.com \
    --cc=jlbec@evilplan.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark@fasheh.com \
    --cc=ocfs2-devel@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®