From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Sat, 30 Sep 2023 22:07:02 +0000 (+0200)
Subject: libblkid: (ddf_raid) validate size in standard minsz predicate
X-Git-Tag: v2.40-rc1~221^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d11af64ede9407fe7f951c9e54b9e288ef492ae2;p=thirdparty%2Futil-linux.git

libblkid: (ddf_raid) validate size in standard minsz predicate

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

diff --git a/libblkid/src/superblocks/ddf_raid.c b/libblkid/src/superblocks/ddf_raid.c
index 66b49396ac..a7cf32cf40 100644
--- a/libblkid/src/superblocks/ddf_raid.c
+++ b/libblkid/src/superblocks/ddf_raid.c
@@ -80,9 +80,6 @@ static int probe_ddf(blkid_probe pr,
 	char version[DDF_REV_LENGTH + 1];
 	uint64_t off = 0, lba;
 
-	if (pr->size < 0x30000)
-		return 1;
-
 	for (i = 0; i < ARRAY_SIZE(hdrs); i++) {
 		off = ((pr->size / 0x200) - hdrs[i]) * 0x200;
 
@@ -134,6 +131,7 @@ static int probe_ddf(blkid_probe pr,
 const struct blkid_idinfo ddfraid_idinfo = {
 	.name		= "ddf_raid_member",
 	.usage		= BLKID_USAGE_RAID,
+	.minsz		= 0x30000,
 	.probefunc	= probe_ddf,
 	.magics		= BLKID_NONE_MAGIC
 };