* [PATCH] Btrfs-progs: sanity check the number of items in a leaf V2
@ 2013-05-09 13:56 Josef Bacik
0 siblings, 0 replies; only message in thread
From: Josef Bacik @ 2013-05-09 13:56 UTC (permalink / raw)
To: linux-btrfs
I hit this while working on fsck, I got some weird corruption where the number
of items was way higher than what would fit in a leaf, which would make things
blow up. This fixes the problem by catching it and returning an error so we
gracefully exit instead of segfaulting. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
---
V1->V2: 0 nritems is valid for leaves.
ctree.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ctree.c b/ctree.c
index 16f4daa..4598665 100644
--- a/ctree.c
+++ b/ctree.c
@@ -638,6 +638,12 @@ int btrfs_check_leaf(struct btrfs_root *root,
struct btrfs_disk_key key;
u32 nritems = btrfs_header_nritems(buf);
+ if (nritems * sizeof(struct btrfs_item) > buf->len) {
+ fprintf(stderr, "invalid number of items %llu\n",
+ (unsigned long long)buf->start);
+ goto fail;
+ }
+
if (btrfs_header_level(buf) != 0) {
fprintf(stderr, "leaf is not a leaf %llu\n",
(unsigned long long)btrfs_header_bytenr(buf));
--
1.7.7.6
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-09 13:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-09 13:56 [PATCH] Btrfs-progs: sanity check the number of items in a leaf V2 Josef Bacik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).