partitions/efi: check pmbr record's starting lba

[platform/adaptation/renesas_rcar/renesas_kernel.git] / block / partitions / efi.c

diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index c85fc89..7a2b74f 100644 (file)
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -149,13 +149,21 @@ static u64 last_lba(struct block_device *bdev)
                       bdev_logical_block_size(bdev)) - 1ULL;
 }
 
-static inline int
-pmbr_part_valid(struct partition *part)
+static inline int pmbr_part_valid(gpt_mbr_record *part)
 {
-        if (part->sys_ind == EFI_PMBR_OSTYPE_EFI_GPT &&
-            le32_to_cpu(part->start_sect) == 1UL)
-                return 1;
-        return 0;
+       if (part->os_type != EFI_PMBR_OSTYPE_EFI_GPT)
+               goto invalid;
+
+       /* set to 0x00000001 (i.e., the LBA of the GPT Partition Header) */
+       if (le32_to_cpu(part->starting_lba) != GPT_PRIMARY_PARTITION_TABLE_LBA)
+               goto invalid;
+
+       if (le32_to_cpu(part->start_sector) != 1UL)
+               goto invalid;
+
+       return 1;
+invalid:
+       return 0;
 }
 
 /**