From: Daniel Xu <dxu@dxuuu.xyz>
Date: Fri, 13 Nov 2020 01:55:06 +0000 (-0800)
Subject: btrfs: tree-checker: add missing return after error in root_item
X-Git-Tag: v5.4.81~94
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0115a26133976c359841ee59c65d9f01b11b3970;p=users%2Fdwmw2%2Flinux.git

btrfs: tree-checker: add missing return after error in root_item

commit 1a49a97df657c63a4e8ffcd1ea9b6ed95581789b upstream.

There's a missing return statement after an error is found in the
root_item, this can cause further problems when a crafted image triggers
the error.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=210181
Fixes: 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")
CC: stable@vger.kernel.org # 5.4+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index 48e46323d519c..70df55774222d 100644
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -913,6 +913,7 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
 			    "invalid root item size, have %u expect %zu or %u",
 			    btrfs_item_size_nr(leaf, slot), sizeof(ri),
 			    btrfs_legacy_root_item_size());
+		return -EUCLEAN;
 	}
 
 	/*