From: Timo Warns <Warns@pre-sense.de>
Date: Fri, 6 May 2011 11:47:35 +0000 (+0200)
Subject: Validate size of EFI GUID partition entries.
X-Git-Tag: v2.6.34.11~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef587df573ad04e0ac03bc80ce1231cbcc2f3a64;p=thirdparty%2Fkernel%2Fstable.git

Validate size of EFI GUID partition entries.

commit fa039d5f6b126fbd65eefa05db2f67e44df8f121 upstream.

Otherwise corrupted EFI partition tables can cause total confusion.

Signed-off-by: Timo Warns <warns@pre-sense.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
index 91babdae75875..ee59684b36943 100644
--- a/fs/partitions/efi.c
+++ b/fs/partitions/efi.c
@@ -350,6 +350,12 @@ is_gpt_valid(struct block_device *bdev, u64 lba,
 		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");
+		goto fail;
+	}
+
 	if (!(*ptes = alloc_read_gpt_entries(bdev, *gpt)))
 		goto fail;