Skip to contentSkip to conversation

metadump: catch used extent array overflow

PATCH Superseded [email protected] 3 participants 6 messages Nov 11, 2025 – Nov 13, 2025

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 metadump: catch used extent array overflow

From: Carlos Maiolino <[email protected]>

An user reported a SIGSEGV when attempting to create a metadump image of a filesystem.
The reason is because we fail to catch a possible overflow in the used extents array in process_exinode() which may happen if the extent count is corrupted.
This leads process_bmbt_reclist() to attempt to index into the array using the bogus extent count with:

convert_extent(&rp[numrecs - 1], &o, &s, &c, &f);

Fix this by extending the used counter to xfs_extnum_t (uint64_t) and checking for the overflow possibility.

---
 db/metadump.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)
db/metadump.c +19 -9
index 24eb99da1723..430120ec8888 100644
@@ -2395,21 +2395,25 @@ process_btinode(
 
 static int
 process_exinode(
-	struct xfs_dinode 	*dip,
+	struct xfs_dinode	*dip,
 	int			whichfork)
 {
 	xfs_extnum_t		max_nex = xfs_iext_max_nextents(
 			xfs_dinode_has_large_extent_counts(dip), whichfork);
 	xfs_extnum_t		nex = xfs_dfork_nextents(dip, whichfork);
-	int			used = nex * sizeof(struct xfs_bmbt_rec);
+	xfs_extnum_t		used = nex * sizeof(struct xfs_bmbt_rec);
 
-	if (nex > max_nex || used > XFS_DFORK_SIZE(dip, mp, whichfork)) {
-		if (metadump.show_warnings)
-			print_warning("bad number of extents %llu in inode %lld",
-				(unsigned long long)nex,
-				(long long)metadump.cur_ino);
-		return 1;
-	}
+	/* Catch used extent array overflows */
+	if (used < nex)
+	       goto out_warn;
+
+	/* Invalid number of extents */
+	if (nex > max_nex)
+		goto out_warn;
+
+	/* Extent array should fit into the inode fork */
+	if (used > XFS_DFORK_SIZE(dip, mp, whichfork))
+		goto out_warn;
 
 	/* Zero unused data fork past used extents */
 	if (metadump.zero_stale_data &&
@@ -2421,6 +2425,12 @@ process_exinode(
 	return process_bmbt_reclist(dip, whichfork,
 			(struct xfs_bmbt_rec *)XFS_DFORK_PTR(dip, whichfork),
 			nex);
+
+out_warn:
+	if (metadump.show_warnings)
+		print_warning("bad number of extents %llu in inode %lld",
+			(unsigned long long)nex, (long long)metadump.cur_ino);
+	return 1;
 }
 
 static int
Signature · 1 line
2.51.0
#1 lore raw

db/metadump.c process_btinode( · line 2404

Quoted 2 lines · On Tue, Nov 11, 2025 at 03:10:57PM +0100, [email protected] wrote:
db/metadump.c +1 -1
-	int			used = nex * sizeof(struct xfs_bmbt_rec);
+	xfs_extnum_t		used = nex * sizeof(struct xfs_bmbt_rec);

used really isn't a xfs_extnum_t, so you probably just want to use an undecored uint64_t.

Otherwise this looks good.

#2 lore raw
Quoted 6 lines · Christoph Hellwig

db/metadump.c process_btinode( · line 2404

Quoted 2 lines · On Tue, Nov 11, 2025 at 03:10:57PM +0100, [email protected] wrote:
db/metadump.c +1 -1
-	int			used = nex * sizeof(struct xfs_bmbt_rec);
+	xfs_extnum_t		used = nex * sizeof(struct xfs_bmbt_rec);

used really isn't a xfs_extnum_t, so you probably just want to use an undecored uint64_t.

Fair enough. Thanks!

Quoted 2 lines

Otherwise this looks good.

#3 lore raw
Quoted 9 lines · Carlos Maiolino
Quoted 6 lines · Christoph Hellwig

db/metadump.c process_btinode( · line 2404

Quoted 2 lines · On Tue, Nov 11, 2025 at 03:10:57PM +0100, [email protected] wrote:
db/metadump.c +1 -1
-	int			used = nex * sizeof(struct xfs_bmbt_rec);
+	xfs_extnum_t		used = nex * sizeof(struct xfs_bmbt_rec);

used really isn't a xfs_extnum_t, so you probably just want to use an undecored uint64_t.

Fair enough. Thanks!

Does check_mul_overflow work for this purpose?

--D

Quoted 3 lines
Quoted 2 lines

Otherwise this looks good.

#4 lore raw
Quoted 6 lines · Darrick J. Wong
Quoted 4 lines
Quoted 2 lines

used really isn't a xfs_extnum_t, so you probably just want to use an undecored uint64_t.

Fair enough. Thanks!

Does check_mul_overflow work for this purpose?

Oh, I didn't realize we have that in xfsprogs now. Using it here sounds like a good idea.

#5 lore raw
Quoted 11 lines · Christoph Hellwig
Quoted 6 lines · Darrick J. Wong
Quoted 4 lines
Quoted 2 lines

used really isn't a xfs_extnum_t, so you probably just want to use an undecored uint64_t.

Fair enough. Thanks!

Does check_mul_overflow work for this purpose?

Oh, I didn't realize we have that in xfsprogs now. Using it here sounds like a good idea.

+1, thanks Darrick, I'll update it.