From: Karel Zak <kzak@redhat.com>
Date: Fri, 8 Aug 2014 09:56:06 +0000 (+0200)
Subject: libblkid: (gpt) use real sector size to set PTMAGIC_OFFSET
X-Git-Tag: v2.26-rc1~542
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d8a02398a01d8d2930676c992bc91d7ceb8bc17;p=thirdparty%2Futil-linux.git

libblkid: (gpt) use real sector size to set PTMAGIC_OFFSET

So stupid and 5 years old bug...

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c
index 7fccd51a17..728b6ef377 100644
--- a/libblkid/src/partitions/gpt.c
+++ b/libblkid/src/partitions/gpt.c
@@ -329,7 +329,7 @@ static int probe_gpt_pt(blkid_probe pr,
 
 	blkid_probe_use_wiper(pr, lba * blkid_probe_get_size(pr), 8);
 
-	if (blkid_probe_set_magic(pr, lba << 9,
+	if (blkid_probe_set_magic(pr, blkid_probe_get_sectorsize(pr) * lba,
 			      sizeof(GPT_HEADER_SIGNATURE_STR) - 1,
 			      (unsigned char *) GPT_HEADER_SIGNATURE_STR))
 		goto err;