Skip to contentSkip to conversation

btrfs: tree-checker: add missing returns after data_ref alignment checks

PATCH In review David Sterba 2 participants 2 messages Nov 20, 2020

Subsystems (2)
lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

PATCH 1/1 btrfs: tree-checker: add missing returns after data_ref alignment checks

There are sectorsize alignment checks that are reported but then check_extent_data_ref continues. This was not intended, wrong alignment is not a minor problem and we should return with error.

Fixes 0785a9aacf9d ("btrfs: tree-checker: Add EXTENT_DATA_REF check")
---
 fs/btrfs/tree-checker.c | 2 ++
 1 file changed, 2 insertions(+)
fs/btrfs/tree-checker.c +2 -0
index 1b27242a9c0b..f3f666b343ef 100644
@@ -1424,6 +1424,7 @@ static int check_extent_data_ref(struct extent_buffer *leaf,
 	"invalid item size, have %u expect aligned to %zu for key type %u",
 			    btrfs_item_size_nr(leaf, slot),
 			    sizeof(*dref), key->type);
+		return -EUCLEAN;
 	}
 	if (!IS_ALIGNED(key->objectid, leaf->fs_info->sectorsize)) {
 		generic_err(leaf, slot,
@@ -1452,6 +1453,7 @@ static int check_extent_data_ref(struct extent_buffer *leaf,
 			extent_err(leaf, slot,
 	"invalid extent data backref offset, have %llu expect aligned to %u",
 				   offset, leaf->fs_info->sectorsize);
+			return -EUCLEAN;
 		}
 	}
 	return 0;
Signature · 1 line
2.25.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · David Sterba

There are sectorsize alignment checks that are reported but then check_extent_data_ref continues. This was not intended, wrong alignment is not a minor problem and we should return with error.

Fixes 0785a9aacf9d ("btrfs: tree-checker: Add EXTENT_DATA_REF check")

Thanks,
Qu

Quoted 25 lines
---
 fs/btrfs/tree-checker.c | 2 ++
 1 file changed, 2 insertions(+)
fs/btrfs/tree-checker.c +2 -0
index 1b27242a9c0b..f3f666b343ef 100644
@@ -1424,6 +1424,7 @@ static int check_extent_data_ref(struct extent_buffer *leaf,
 	"invalid item size, have %u expect aligned to %zu for key type %u",
 			    btrfs_item_size_nr(leaf, slot),
 			    sizeof(*dref), key->type);
+		return -EUCLEAN;
 	}
 	if (!IS_ALIGNED(key->objectid, leaf->fs_info->sectorsize)) {
 		generic_err(leaf, slot,
@@ -1452,6 +1453,7 @@ static int check_extent_data_ref(struct extent_buffer *leaf,
 			extent_err(leaf, slot,
 	"invalid extent data backref offset, have %llu expect aligned to %u",
 				   offset, leaf->fs_info->sectorsize);
+			return -EUCLEAN;
 		}
 	}
 	return 0;