From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 3/3] btrfs-progs: print-tree: Enhance btrfs_print_tree() check to avoid out-of-boundary memory access
Date: Mon, 30 Apr 2018 11:15:45 +0800 [thread overview]
Message-ID: <20180430031545.29891-3-wqu@suse.com> (raw)
In-Reply-To: <20180430031545.29891-1-wqu@suse.com>
For btrfs_print_tree(), if nr_items is corrupted, it can easily go
beyond extent buffer boundary.
Add extra nr_item check, and only print as many valid slots as possible.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
print-tree.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/print-tree.c b/print-tree.c
index 31a851ef4413..55db80bebb2a 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -1376,6 +1376,11 @@ void btrfs_print_tree(struct extent_buffer *eb, int follow)
btrfs_print_leaf(eb);
return;
}
+ /* We are crossing eb boundary, this node must be corrupted */
+ if (nr > BTRFS_NODEPTRS_PER_EXTENT_BUFFER(eb))
+ warning(
+ "node nr_items corrupted, has %u limit %u, continue print anyway",
+ nr, BTRFS_NODEPTRS_PER_EXTENT_BUFFER(eb));
printf("node %llu level %d items %d free %u generation %llu owner ",
(unsigned long long)eb->start,
btrfs_header_level(eb), nr,
@@ -1386,7 +1391,11 @@ void btrfs_print_tree(struct extent_buffer *eb, int follow)
print_uuids(eb);
fflush(stdout);
for (i = 0; i < nr; i++) {
- u64 blocknr = btrfs_node_blockptr(eb, i);
+ u64 blocknr;
+
+ if (i > BTRFS_NODEPTRS_PER_EXTENT_BUFFER(eb))
+ break;
+ blocknr = btrfs_node_blockptr(eb, i);
btrfs_node_key(eb, &disk_key, i);
btrfs_disk_key_to_cpu(&key, &disk_key);
printf("\t");
--
2.17.0
next prev parent reply other threads:[~2018-04-30 3:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-30 3:15 [PATCH 1/3] btrfs-progs: Remove fs_info parameter from btrfs_leaf_free_space() Qu Wenruo
2018-04-30 3:15 ` [PATCH 2/3] btrfs-progs: Allow tree to be printed without an fs_info Qu Wenruo
2018-04-30 3:33 ` Su Yue
2018-04-30 3:15 ` Qu Wenruo [this message]
2018-04-30 3:49 ` [PATCH 3/3] btrfs-progs: print-tree: Enhance btrfs_print_tree() check to avoid out-of-boundary memory access Su Yue
2018-04-30 3:51 ` Qu Wenruo
2018-05-09 11:57 ` David Sterba
2018-05-10 1:50 ` Qu Wenruo
2018-05-31 11:54 ` David Sterba
2018-04-30 3:27 ` [PATCH 1/3] btrfs-progs: Remove fs_info parameter from btrfs_leaf_free_space() Su Yue
2018-05-09 11:58 ` David Sterba
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=20180430031545.29891-3-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@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