From: Charalampos Mitrodimas <charmitro@posteo.net>
To: Carlos Maiolino <cem@kernel.org>
Cc: linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] xfs: Verify DA node btree hash order
Date: Sat, 12 Apr 2025 20:03:57 +0000 [thread overview]
Message-ID: <20250412-xfs-hash-check-v1-1-fec1fef5d006@posteo.net> (raw)
The xfs_da3_node_verify() function checks the integrity of directory
and attribute B-tree node blocks. However, it was missing a check to
ensure that the hash values of the btree entries within the node are
strictly increasing, as required by the B-tree structure.
Add a loop to iterate through the btree entries and verify that each
entry's hash value is greater than the previous one. If an
out-of-order hash value is detected, return failure to indicate
corruption.
This addresses the "XXX: hash order check?" comment and improves
corruption detection for DA node blocks.
Signed-off-by: Charalampos Mitrodimas <charmitro@posteo.net>
---
fs/xfs/libxfs/xfs_da_btree.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index 17d9e6154f1978ce5a5cb82176eea4d6b9cd768d..6c748911e54619c3ceae9b81f55cf61da6735f01 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -247,7 +247,16 @@ xfs_da3_node_verify(
ichdr.count > mp->m_attr_geo->node_ents)
return __this_address;
- /* XXX: hash order check? */
+ /* Check hash order */
+ uint32_t prev_hash = be32_to_cpu(ichdr.btree[0].hashval);
+
+ for (int i = 1; i < ichdr.count; i++) {
+ uint32_t curr_hash = be32_to_cpu(ichdr.btree[i].hashval);
+
+ if (curr_hash <= prev_hash)
+ return __this_address;
+ prev_hash = curr_hash;
+ }
return NULL;
}
---
base-commit: ecd5d67ad602c2c12e8709762717112ef0958767
change-id: 20250412-xfs-hash-check-be7397881a2c
Best regards,
--
Charalampos Mitrodimas <charmitro@posteo.net>
next reply other threads:[~2025-04-12 20:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <6Fo_nCBU7RijxC1Kg6qD573hCAQBTcddQlb7i0E9C7tbpPIycSQ8Vt3BeW-1DqdayPO9EzyJLyNgxpH6rfts4g==@protonmail.internalid>
2025-04-12 20:03 ` Charalampos Mitrodimas [this message]
2025-04-14 22:15 ` Darrick J. Wong
2025-04-15 1:08 ` Charalampos Mitrodimas
2025-04-30 9:23 ` Carlos Maiolino
2025-05-01 14:12 ` Darrick J. Wong
2025-05-01 18:54 ` Charalampos Mitrodimas
2025-05-03 21:12 ` Charalampos Mitrodimas
2025-05-05 7:10 ` Carlos Maiolino
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=20250412-xfs-hash-check-v1-1-fec1fef5d006@posteo.net \
--to=charmitro@posteo.net \
--cc=cem@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/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®