|
 |
9cc286 |
From 1190dc5b214ce6ba4cbeadbdd599ab3ebb2cbb13 Mon Sep 17 00:00:00 2001
|
|
|
9cc286 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
9cc286 |
Date: Fri, 8 Jun 2012 14:42:45 -0700
|
|
|
9cc286 |
Subject: [PATCH] libparted: Fix endian error with FirstUsableLBA (#829960)
|
|
|
9cc286 |
|
|
|
9cc286 |
On big-endial systems (eg. ppc64) this would cause parted to
|
|
|
9cc286 |
crash.
|
|
|
9cc286 |
|
|
|
9cc286 |
* NEWS: add new bugfix
|
|
|
9cc286 |
* libparted/labels/gpt.c (gpt_get_max_supported_partition_count):
|
|
|
9cc286 |
fix endian issues with pth->FirstUsableLBA
|
|
|
9cc286 |
---
|
|
|
9cc286 |
NEWS | 3 ++-
|
|
|
9cc286 |
libparted/labels/gpt.c | 4 ++--
|
|
|
9cc286 |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
9cc286 |
|
|
|
9cc286 |
diff --git a/NEWS b/NEWS
|
|
|
9cc286 |
index b0a0657..596ab37 100644
|
|
|
9cc286 |
--- a/NEWS
|
|
|
9cc286 |
+++ b/NEWS
|
|
|
9cc286 |
@@ -1,9 +1,10 @@
|
|
|
9cc286 |
GNU parted NEWS -*- outline -*-
|
|
|
9cc286 |
|
|
|
9cc286 |
-* Noteworthy changes in release 3.1-2 (2012-03-21) [Fedora]
|
|
|
9cc286 |
+* Noteworthy changes in release 3.1-4 (2012-06-08) [Fedora]
|
|
|
9cc286 |
|
|
|
9cc286 |
** Bug Fixes
|
|
|
9cc286 |
|
|
|
9cc286 |
+ libparted: Don't crash on big-endian systems when using GPT
|
|
|
9cc286 |
libparted: Treat disks without a PMBR as msdos labeled disks
|
|
|
9cc286 |
even if they have GPT partition tables.
|
|
|
9cc286 |
|
|
|
9cc286 |
diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
|
|
|
9cc286 |
index ab2145e..6ca33c8 100644
|
|
|
9cc286 |
--- a/libparted/labels/gpt.c
|
|
|
9cc286 |
+++ b/libparted/labels/gpt.c
|
|
|
9cc286 |
@@ -1787,12 +1787,12 @@ gpt_get_max_supported_partition_count (const PedDisk *disk, int *max_n)
|
|
|
9cc286 |
|
|
|
9cc286 |
if (!_header_is_valid (disk, pth, 1))
|
|
|
9cc286 |
{
|
|
|
9cc286 |
- pth->FirstUsableLBA = 34;
|
|
|
9cc286 |
+ pth->FirstUsableLBA = PED_CPU_TO_LE64 (34);
|
|
|
9cc286 |
pth->SizeOfPartitionEntry
|
|
|
9cc286 |
= PED_CPU_TO_LE32 (sizeof (GuidPartitionEntry_t));
|
|
|
9cc286 |
}
|
|
|
9cc286 |
|
|
|
9cc286 |
- *max_n = (disk->dev->sector_size * (pth->FirstUsableLBA - 2)
|
|
|
9cc286 |
+ *max_n = (disk->dev->sector_size * (PED_LE64_TO_CPU (pth->FirstUsableLBA)-2)
|
|
|
9cc286 |
/ PED_LE32_TO_CPU (pth->SizeOfPartitionEntry));
|
|
|
9cc286 |
pth_free (pth);
|
|
|
9cc286 |
return true;
|
|
|
9cc286 |
--
|
|
|
9cc286 |
1.7.7.6
|
|
|
9cc286 |
|