Ensure that the GPT header is at least the size of the structure.
Subsystems (2)
PATCH 1/1 Ensure that the GPT header is at least the size of the structure.
UEFI 2.3.1D will include a change to the spec language mandating that a GPT header must be greater than *or equal to* the size of the defined structure. While verifying that this would work on Linux, I discovered that we're not actually checking the minimum bound at all.
The result of this is that when we verify the checksum, it's possible that on a malformed header (with header_size of 0), we won't actually verify any data.
--- block/partitions/efi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
block/partitions/efi.c +10 -2
@@ -310,15 +310,23 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba, goto fail; } -/* Check the GUID Partition Table header size */ +/* Check the GUID Partition Table header size is too big */ if (le32_to_cpu ((*gpt)->header_size) >bdev_logical_block_size (state->bdev)) { -pr_debug ("GUID Partition Table Header size is wrong: %u > %u\n" , +pr_debug ("GUID Partition Table Header size is too large: %u > %u\n" ,le32_to_cpu ((*gpt)->header_size),bdev_logical_block_size (state->bdev)); goto fail; } +/* Check the GUID Partition Table header size is too small */ +if (le32_to_cpu ((*gpt)->header_size) <sizeof (gpt_header)) { +pr_debug ("GUID Partition Table Header size is too small: %u < %u\n" , +le32_to_cpu ((*gpt)->header_size), +sizeof (gpt_header)); + goto fail; + } +/* Check the GUID Partition Table CRC */ origcrc =le32_to_cpu ((*gpt)->header_crc32); (*gpt)->header_crc32 =0 ;
Signature · 1 line
1.8.1.2
PATCH 1/1 Ensure that the GPT header is at least the size of the structure.
UEFI 2.3.1D will include a change to the spec language mandating that a GPT header must be greater than *or equal to* the size of the defined structure. While verifying that this would work on Linux, I discovered that we're not actually checking the minimum bound at all.
The result of this is that when we verify the checksum, it's possible that on a malformed header (with header_size of 0), we won't actually verify any data.
(ammended to fix type error in pr_debug())
--- block/partitions/efi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
block/partitions/efi.c +10 -2
@@ -310,15 +310,23 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba, goto fail; } -/* Check the GUID Partition Table header size */ +/* Check the GUID Partition Table header size is too big */ if (le32_to_cpu ((*gpt)->header_size) >bdev_logical_block_size (state->bdev)) { -pr_debug ("GUID Partition Table Header size is wrong: %u > %u\n" , +pr_debug ("GUID Partition Table Header size is too large: %u > %u\n" ,le32_to_cpu ((*gpt)->header_size),bdev_logical_block_size (state->bdev)); goto fail; } +/* Check the GUID Partition Table header size is too small */ +if (le32_to_cpu ((*gpt)->header_size) <sizeof (gpt_header)) { +pr_debug ("GUID Partition Table Header size is too small: %u < %lu\n" , +le32_to_cpu ((*gpt)->header_size), +sizeof (gpt_header)); + goto fail; + } +/* Check the GUID Partition Table CRC */ origcrc =le32_to_cpu ((*gpt)->header_crc32); (*gpt)->header_crc32 =0 ;
Signature · 1 line
1.8.1.2
Quoted 36 lines · Peter Jones
UEFI 2.3.1D will include a change to the spec language mandating that a GPT header must be greater than *or equal to* the size of the defined structure. While verifying that this would work on Linux, I discovered that we're not actually checking the minimum bound at all.
The result of this is that when we verify the checksum, it's possible that on a malformed header (with
header_sizeof 0), we won't actually verify any data.(ammended to fix type error in
pr_debug())Signed-off-by Peter Jones <[email protected]>--- block/partitions/efi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)block/partitions/efi.c +3
-2@@ -310,15 +310,23 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba, goto fail; } -/* Check the GUID Partition Table header size */ +/* Check the GUID Partition Table header size is too big */ if (le32_to_cpu ((*gpt)->header_size) >bdev_logical_block_size (state->bdev)) { -pr_debug ("GUID Partition Table Header size is wrong: %u > %u\n" , +pr_debug ("GUID Partition Table Header size is too large: %u > %u\n" ,le32_to_cpu ((*gpt)->header_size),bdev_logical_block_size (state->bdev)); goto fail; } +/* Check the GUID Partition Table header size is too small */
block/partitions/efi.c static int is_gpt_valid(struct parsed_partitions *state, u64 lba, · line 332
Quoted 10 lines
block/partitions/efi.c +7
-0+if (le32_to_cpu ((*gpt)->header_size) <sizeof (gpt_header)) { +pr_debug ("GUID Partition Table Header size is too small: %u < %lu\n" , +le32_to_cpu ((*gpt)->header_size), +sizeof (gpt_header)); + goto fail; + } +/* Check the GUID Partition Table CRC */ origcrc =le32_to_cpu ((*gpt)->header_crc32); (*gpt)->header_crc32 =0 ;
Seems straight forward.