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

libblkid: (highpoint_raid) validate size in standard minsz predicate

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

diff --git a/libblkid/src/superblocks/highpoint_raid.c b/libblkid/src/superblocks/highpoint_raid.c
index 24879302c7..c8b1297745 100644
--- a/libblkid/src/superblocks/highpoint_raid.c
+++ b/libblkid/src/superblocks/highpoint_raid.c
@@ -29,8 +29,6 @@ static int probe_highpoint45x(blkid_probe pr,
 	uint64_t off;
 	uint32_t magic;
 
-	if (pr->size < 0x10000)
-		return 1;
 	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
 		return 1;
 
@@ -62,6 +60,7 @@ static int probe_highpoint37x(blkid_probe pr,
 const struct blkid_idinfo highpoint45x_idinfo = {
 	.name		= "hpt45x_raid_member",
 	.usage		= BLKID_USAGE_RAID,
+	.minsz		= 0x10000,
 	.probefunc	= probe_highpoint45x,
 	.magics		= BLKID_NONE_MAGIC
 };