OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes for GPT partition parsing 

1. Don't handle invalid or empty pte entries

num_partition_entries field in GPT typically means number of maximum entries
and not the number of used entries. Empty entries are indentified with
"0" partition type guid. Loop through all the entries

2. Fix the GPT partition size calculation

"ending_lba" is included in the partition, it is not the start of the next one.
Thus the correct size of the partition is end-start+1

Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
This commit is contained in:
Jukka Laitinen 2022-09-26 15:44:07 +04:00 committed by Xiang Xiao
parent 98724477e7
commit dd2ffbc768
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/partition/fs_gpt.c
View File

@ -390,6 +390,7 @@ int parse_gpt_partition(FAR struct partition_state_s *state,
FAR struct gpt_header_s *gpt;
FAR struct gpt_entry_s *ptes;
struct partition_s pentry;
blkcnt_t lastlba;
int nb_part;
int count;
int ret;
@ -462,12 +463,20 @@ int parse_gpt_partition(FAR struct partition_state_s *state,
goto err;
}
lastlba = gpt_last_lba(state);
nb_part = le32toh(gpt->num_partition_entries);
for (pentry.index = 0; pentry.index < nb_part; pentry.index++)
{
/* Skip the empty or invalid entries */
if (!gpt_pte_is_valid(&ptes[pentry.index], lastlba))
{
continue;
}
pentry.firstblock = GPT_LBA_TO_BLOCK(ptes[pentry.index].starting_lba,
state->blocksize);
pentry.nblocks = GPT_LBA_TO_BLOCK(ptes[pentry.index].ending_lba,
pentry.nblocks = GPT_LBA_TO_BLOCK(ptes[pentry.index].ending_lba + 1,
state->blocksize) -
pentry.firstblock;
pentry.blocksize = state->blocksize;