From: biubiuzy <294772273@qq.com>
Date: Wed, 17 Jan 2024 03:23:47 +0000 (+0800)
Subject: libblkid: (drbd) reduce false-positive
X-Git-Tag: v2.40-rc1~30^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d19f9bec7997e90b36422c6779ec1d98def95f3;p=thirdparty%2Futil-linux.git

libblkid: (drbd) reduce false-positive
---

diff --git a/libblkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c
index 811098a5d2..96a216839b 100644
--- a/libblkid/src/superblocks/drbd.c
+++ b/libblkid/src/superblocks/drbd.c
@@ -23,6 +23,12 @@ enum {
 	DRBD_VERSION_09,
 };
 
+/*
+ * drbd/drbd_int.h
+ */
+#define BM_BLOCK_SHIFT	12			 /* 4k per bit */
+#define BM_BLOCK_SIZE	 (1<<BM_BLOCK_SHIFT)
+
 /*
  * user/drbdmeta.c
  * We support v08 and v09
@@ -140,6 +146,9 @@ static int probe_drbd_84(blkid_probe pr, const struct blkid_idmag *mag)
 	if (!md)
 		return errno ? -errno : 1;
 
+	if (be32_to_cpu(read_unaligned_member(md, bm_bytes_per_bit)) != BM_BLOCK_SIZE)
+		return 1;
+
 	if (!is_zero_padded(member_ptr(md, padding_start),
 			    member_ptr(md, padding_end)))
 		return 1;
@@ -165,6 +174,9 @@ static int probe_drbd_90(blkid_probe pr, const struct blkid_idmag *mag)
 	if (!md)
 		return errno ? -errno : 1;
 
+	if (be32_to_cpu(read_unaligned_member(md, bm_bytes_per_bit)) != BM_BLOCK_SIZE)
+		return 1;
+
 	if (!is_zero_padded(member_ptr(md, padding_start),
 			    member_ptr(md, padding_end)))
 		return 1;