2012-10-25 11:15:48

by Davidlohr Bueso

[permalink] [raw]
Subject: [PATCH RESEND 2/3] partitions: efi: verify header is outside usable area

The first usable logical block can be used by a GUID partition
entry, and therefore cannot be used by the header.

Signed-off-by: Davidlohr Bueso <[email protected]>
---
block/partitions/efi.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index 7795bb4..abf33a2 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -363,6 +363,13 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba,
goto fail;
}

+ /* The header must be outside usable range */
+ if (le64_to_cpu((*gpt)->first_usable_lba) < lba &&
+ le64_to_cpu((*gpt)->last_usable_lba) > lba) {
+ pr_debug("GPT: Header is inside usable area\n");
+ goto fail;
+ }
+
/* Check that sizeof_partition_entry has the correct value */
if (le32_to_cpu((*gpt)->sizeof_partition_entry) != sizeof(gpt_entry)) {
pr_debug("GUID Partitition Entry Size check failed.\n");
--
1.7.9.5