Commit c2fdd345 authored by Kever Yang's avatar Kever Yang Committed by Tom Rini
Browse files

cmd: gpt: fix the wrong size parse for the last partition



The calculation of "dev_desc->lba - 34  - 1 - offset" is not correct for
size '-', because both fist_usable_lba and last_usable_lba will remain
34 sectors.

We can simply use 0 for size '-' because the part_efi module will decode
the size and auto extend the size to maximum available size.
Signed-off-by: default avatarKever Yang <kever.yang@rock-chips.com>
parent 584550d7
......@@ -298,8 +298,8 @@ static int set_gpt_info(struct blk_desc *dev_desc,
if (extract_env(val, &p))
p = val;
if ((strcmp(p, "-") == 0)) {
/* remove first usable lba and last block */
parts[i].size = dev_desc->lba - 34 - 1 - offset;
/* Let part efi module to auto extend the size */
parts[i].size = 0;
} else {
size_ll = ustrtoull(p, &p, 0);
parts[i].size = lldiv(size_ll, dev_desc->blksz);
......
......@@ -655,6 +655,10 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,
(unsigned long long)partitions[i].size);
if (le64_to_cpu(gpt_part_size) != partitions[i].size) {
/* We do not check the extend partition size */
if ((i == parts - 1) && (partitions[i].size == 0))
continue;
error("Partition %s size: %llu does not match %llu!\n",
efi_str, (unsigned long long)gpt_part_size,
(unsigned long long)partitions[i].size);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment