summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Warns <Warns@pre-sense.de>2011-05-06 13:47:35 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-06 16:46:37 +0200
commitfa039d5f6b126fbd65eefa05db2f67e44df8f121 (patch)
treebfd1fcc3bca88d6d43650a76575b04c21c2d2c24
parentMerge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91 (diff)
downloadlinux-fa039d5f6b126fbd65eefa05db2f67e44df8f121.tar.xz
linux-fa039d5f6b126fbd65eefa05db2f67e44df8f121.zip
Validate size of EFI GUID partition entries.
Otherwise corrupted EFI partition tables can cause total confusion. Signed-off-by: Timo Warns <warns@pre-sense.de> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/partitions/efi.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
index ac0ccb5026a2..19d6750d1d6c 100644
--- a/fs/partitions/efi.c
+++ b/fs/partitions/efi.c
@@ -348,6 +348,12 @@ static int is_gpt_valid(struct parsed_partitions *state, 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(state, *gpt)))
goto fail;