* [PATCH 1/3] fdisk: gpt: check header size
@ 2012-11-14 8:04 Davidlohr Bueso
2012-11-14 9:51 ` Karel Zak
0 siblings, 1 reply; 2+ messages in thread
From: Davidlohr Bueso @ 2012-11-14 8:04 UTC (permalink / raw)
To: Karel Zak, Petr Uzel; +Cc: util-linux
UEFI states that the size of the GPT header must be between 92 and
the sector size. Add the check when verifying a valid header.
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
fdisks/gpt.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/fdisks/gpt.c b/fdisks/gpt.c
index 4a535f2..df26696 100644
--- a/fdisks/gpt.c
+++ b/fdisks/gpt.c
@@ -49,6 +49,7 @@
#define GPT_HEADER_REVISION_V1_02 0x00010200
#define GPT_HEADER_REVISION_V1_00 0x00010000
#define GPT_HEADER_REVISION_V0_99 0x00009900
+#define GPT_HEADER_MINSZ 92 /* bytes */
#define GPT_PMBR_LBA 0
#define GPT_MBR_PROTECTIVE 1
@@ -183,7 +184,7 @@ static struct fdisk_parttype gpt_parttypes[] =
DEF_GUID("E6D6D379-F507-44C2-A23C-238F2A3DF928", N_("Linux LVM")),
DEF_GUID("8DA63339-0007-60C0-C436-083AC8230908", N_("Linux reserved")),
- /* FreeBSD */
+ /* FreeBSD */
DEF_GUID("516E7CB4-6ECF-11D6-8FF8-00022D09712B", N_("FreeBSD data")),
DEF_GUID("83BD6B9D-7F41-11DC-BE0B-001560B84F0F", N_("FreeBSD boot")),
DEF_GUID("516E7CB5-6ECF-11D6-8FF8-00022D09712B", N_("FreeBSD swap")),
@@ -660,6 +661,7 @@ static int gpt_check_signature(struct gpt_header *header)
static struct gpt_header *gpt_get_header(struct fdisk_context *cxt, uint64_t lba)
{
struct gpt_header *header = NULL;
+ uint32_t hsz;
if (!cxt)
return NULL;
@@ -684,6 +686,11 @@ static struct gpt_header *gpt_get_header(struct fdisk_context *cxt, uint64_t lba
if (le64_to_cpu(header->my_lba) != lba)
goto invalid;
+ /* make sure header size is between 92 and sector size bytes */
+ hsz = le32_to_cpu(header->size);
+ if (hsz < GPT_HEADER_MINSZ || hsz > cxt->sector_size)
+ goto invalid;
+
return header;
invalid:
free(header);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/3] fdisk: gpt: check header size
2012-11-14 8:04 [PATCH 1/3] fdisk: gpt: check header size Davidlohr Bueso
@ 2012-11-14 9:51 ` Karel Zak
0 siblings, 0 replies; 2+ messages in thread
From: Karel Zak @ 2012-11-14 9:51 UTC (permalink / raw)
To: Davidlohr Bueso; +Cc: Petr Uzel, util-linux
On Wed, Nov 14, 2012 at 12:04:24AM -0800, Davidlohr Bueso wrote:
> ---
> fdisks/gpt.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
Applied, thanks.
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-14 9:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-14 8:04 [PATCH 1/3] fdisk: gpt: check header size Davidlohr Bueso
2012-11-14 9:51 ` Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).