2 files changed, 16 insertions, 0 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 99dfd889b9f7..044981cf6df9 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -417,6 +417,16 @@ int btrfs_verify_level_key(struct extent_buffer *eb, int level,
          */
         if (btrfs_header_generation(eb) > fs_info->last_trans_committed)
                 return 0;
+
+        /* We have @first_key, so this @eb must have at least one item */
+        if (btrfs_header_nritems(eb) == 0) {
+                btrfs_err(fs_info,
+                "invalid tree nritems, bytenr=%llu nritems=0 expect >0",
+                          eb->start);
+                WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+                return -EUCLEAN;
+        }
+
         if (found_level)
                 btrfs_node_key_to_cpu(eb, &found_key, 0);
         else
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index 9645389a1187..43e488f5d063 100644
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -1325,6 +1325,12 @@ static int check_leaf(struct extent_buffer *leaf, bool check_item_data)
                                     owner);
                         return -EUCLEAN;
                 }
+                /* Unknown tree */
+                if (owner == 0) {
+                        generic_err(leaf, 0,
+                                "invalid owner, root 0 is not defined");
+                        return -EUCLEAN;
+                }
                 return 0;
         }