From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Wed, 25 Jan 2023 05:34:50 +0000 (+0000)
Subject: libblkid: bcachefs: remove superfluous validations
X-Git-Tag: v2.39-rc1~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c2caec61bc1a2c4a601df71f023363116348d94;p=thirdparty%2Futil-linux.git

libblkid: bcachefs: remove superfluous validations

These checks are redundant as we already validated
* `dev_idx < bcs->nr_devices` in `probe_bcachefs()`
* `field + BYTES(field) < sb_end` in `probe_bcachefs_sb_fields()`
* `member_field_end(members, bcs->nr_devices - 1) == field + BYTES(field)`
  right above.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---

diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c
index aba636a361..ec8a7b3f8b 100644
--- a/libblkid/src/superblocks/bcache.c
+++ b/libblkid/src/superblocks/bcache.c
@@ -167,12 +167,6 @@ static void probe_bcachefs_sb_members(blkid_probe pr,
 			!= member_field_end(members, bcs->nr_devices - 1))
 		return;
 
-	if (member_field_end(members, dev_idx) > sb_end)
-		return;
-
-	if (member_field_end(members, bcs->nr_devices - 1) > sb_end)
-		return;
-
 	blkid_probe_set_uuid_as(pr, members->members[dev_idx].uuid, "UUID_SUB");
 
 	for (i = 0; i < bcs->nr_devices; i++) {