Skip to content
Snippets Groups Projects
Commit ae0e0228 authored by Patrick Delaunay's avatar Patrick Delaunay Committed by Tom Rini
Browse files

disk: efi: correct the overlap check on GPT header and PTE


the partition starting at 0x4400 is refused with overlap error:
  $> gpt write mmc 0 "name=test,start=0x4400,size=0"
  Writing GPT: Partition overlap
  error!

even if the 0x4400 is the first available offset for LBA35 with default
value:
- MBR=LBA1
- GPT header=LBA2
- PTE= 32 LBAs (128 entry), 3 to 34

And the command to have one partition for all the disk failed also :
  $> gpt write mmc 0 "name=test,size=0"

After the patch :

  $> gpt write mmc 0 "name=test,size=0"
  Writing GPT: success!
  $> part list mmc 0

  Partition Map for MMC device 0  --   Partition Type: EFI

  Part	Start LBA	End LBA		Name
	Attributes
	Type GUID
	Partition GUID
  1	0x00000022	0x01ce9fde	"test"
	attrs:	0x0000000000000000
	type:	ebd0a0a2-b9e5-4433-87c0-68b6b72699c7
	type:	data
	guid:	b4b84b8a-04e3-4000-0036-aff5c9c495b1

And 0x22 = 34 LBA => offset = 0x4400 is accepted as expected

Reviewed-by: default avatarŁukasz Majewski <lukma@denx.de>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarPatrick Delaunay <patrick.delaunay@st.com>
parent 30ef7cbb
No related branches found
No related tags found
No related merge requests found
...@@ -469,8 +469,8 @@ int gpt_fill_pte(struct blk_desc *dev_desc, ...@@ -469,8 +469,8 @@ int gpt_fill_pte(struct blk_desc *dev_desc,
* If our partition overlaps with either the GPT * If our partition overlaps with either the GPT
* header, or the partition entry, reject it. * header, or the partition entry, reject it.
*/ */
if (((start <= hdr_end && hdr_start <= (start + size)) || if (((start < hdr_end && hdr_start < (start + size)) ||
(start <= pte_end && pte_start <= (start + size)))) { (start < pte_end && pte_start < (start + size)))) {
printf("Partition overlap\n"); printf("Partition overlap\n");
return -1; return -1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment