1 files changed, 11 insertions, 0 deletions

diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index 96fce4bef4e7..ccd5706199d7 100644
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -132,6 +132,7 @@ static int check_extent_data_item(struct extent_buffer *leaf,
         struct btrfs_file_extent_item *fi;
         u32 sectorsize = fs_info->sectorsize;
         u32 item_size = btrfs_item_size_nr(leaf, slot);
+        u64 extent_end;
 
         if (!IS_ALIGNED(key->offset, sectorsize)) {
                 file_extent_err(leaf, slot,
@@ -207,6 +208,16 @@ static int check_extent_data_item(struct extent_buffer *leaf,
             CHECK_FE_ALIGNED(leaf, slot, fi, num_bytes, sectorsize))
                 return -EUCLEAN;
 
+        /* Catch extent end overflow */
+        if (check_add_overflow(btrfs_file_extent_num_bytes(leaf, fi),
+                               key->offset, &extent_end)) {
+                file_extent_err(leaf, slot,
+        "extent end overflow, have file offset %llu extent num bytes %llu",
+                                key->offset,
+                                btrfs_file_extent_num_bytes(leaf, fi));
+                return -EUCLEAN;
+        }
+
         /*
          * Check that no two consecutive file extent items, in the same leaf,
          * present ranges that overlap each other.