nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 11:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

gpt: properly check that GPT is valid

Browse source
This commit is contained in:
CTCaer 2021-03-17 09:14:50 +02:00
parent f21f13b15d
commit 6981c59de3
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bootloader/storage/nx_emmc.c
View file

@ -34,6 +34,10 @@ void nx_emmc_gpt_parse(link_t *gpt, sdmmc_storage_t *storage)
emummc_storage_read(NX_GPT_FIRST_LBA, NX_GPT_NUM_BLOCKS, gpt_buf); emummc_storage_read(NX_GPT_FIRST_LBA, NX_GPT_NUM_BLOCKS, gpt_buf);
// Check if no GPT or more than max allowed entries.
if (memcmp(&gpt_buf->header.signature, "EFI PART", 8) || gpt_buf->header.num_part_ents > 128)
goto out;
for (u32 i = 0; i < gpt_buf->header.num_part_ents; i++) for (u32 i = 0; i < gpt_buf->header.num_part_ents; i++)
{ {
emmc_part_t *part = (emmc_part_t *)calloc(sizeof(emmc_part_t), 1); emmc_part_t *part = (emmc_part_t *)calloc(sizeof(emmc_part_t), 1);
@ -54,6 +58,7 @@ void nx_emmc_gpt_parse(link_t *gpt, sdmmc_storage_t *storage)
list_append(gpt, &part->link); list_append(gpt, &part->link);
} }
out:
free(gpt_buf); free(gpt_buf);
} }

17
nyx/nyx_gui/frontend/gui_tools_partition_manager.c
View file

@ -750,7 +750,7 @@ static u32 _get_available_l4t_partition()
// Search for a suitable partition. // Search for a suitable partition.
u32 size_sct = 0; u32 size_sct = 0;
if (!memcmp(&gpt->header.signature, "EFI PART", 8)) if (!memcmp(&gpt->header.signature, "EFI PART", 8) || gpt->header.num_part_ents > 128)
{ {
for (u32 i = 0; i < gpt->header.num_part_ents; i++) for (u32 i = 0; i < gpt->header.num_part_ents; i++)
{ {
@ -791,7 +791,7 @@ static bool _get_available_android_partition()
sdmmc_storage_read(&sd_storage, 1, sizeof(gpt_t) >> 9, gpt); sdmmc_storage_read(&sd_storage, 1, sizeof(gpt_t) >> 9, gpt);
// Check if GPT. // Check if GPT.
if (memcmp(&gpt->header.signature, "EFI PART", 8)) if (memcmp(&gpt->header.signature, "EFI PART", 8) || gpt->header.num_part_ents > 128)
goto out; goto out;
// Find kernel partition. // Find kernel partition.
@ -998,7 +998,7 @@ static lv_res_t _action_flash_android_data(lv_obj_t * btns, const char * txt)
sdmmc_storage_read(&sd_storage, 1, sizeof(gpt_t) >> 9, gpt); sdmmc_storage_read(&sd_storage, 1, sizeof(gpt_t) >> 9, gpt);
bool boot_twrp = false; bool boot_twrp = false;
if (memcmp(&gpt->header.signature, "EFI PART", 8)) if (memcmp(&gpt->header.signature, "EFI PART", 8) || gpt->header.num_part_ents > 128)
{ {
lv_label_set_text(lbl_status, "#FFDD00 Error:# No Android GPT was found!"); lv_label_set_text(lbl_status, "#FFDD00 Error:# No Android GPT was found!");
goto error; goto error;
@ -1941,7 +1941,7 @@ static void create_mbox_check_files_total_size()
lv_obj_t *lbl_part = lv_label_create(h1, NULL); lv_obj_t *lbl_part = lv_label_create(h1, NULL);
lv_label_set_recolor(lbl_part, true); lv_label_set_recolor(lbl_part, true);
lv_label_set_text(lbl_part, "#00DDFF Current partition layout:#"); lv_label_set_text(lbl_part, "#00DDFF Current MBR partition layout:#");
// Read current MBR. // Read current MBR.
mbr_t mbr = { 0 }; mbr_t mbr = { 0 };
@ -2059,9 +2059,9 @@ static lv_res_t _action_fix_mbr(lv_obj_t *btn)
sd_unmount(); sd_unmount();
if (memcmp(&gpt->header.signature, "EFI PART", 8)) if (memcmp(&gpt->header.signature, "EFI PART", 8) || gpt->header.num_part_ents > 128)
{ {
lv_label_set_text(lbl_status, "#FFDD00 Warning:# No GPT was found!"); lv_label_set_text(lbl_status, "#FFDD00 Warning:# No valid GPT was found!");
goto out; goto out;
} }
@ -2110,7 +2110,10 @@ static lv_res_t _action_fix_mbr(lv_obj_t *btn)
break; break;
} }
mbr[1].partitions[mbr_idx].type = 0xEE; // GPT protective partition. nx_emmc_gpt_free(&gpt_parsed);
// Set GPT protective partition.
mbr[1].partitions[mbr_idx].type = 0xEE;
mbr[1].partitions[mbr_idx].start_sct = 1; mbr[1].partitions[mbr_idx].start_sct = 1;
mbr[1].partitions[mbr_idx].size_sct = sd_storage.sec_cnt - 1; mbr[1].partitions[mbr_idx].size_sct = sd_storage.sec_cnt - 1;

5
nyx/nyx_gui/storage/nx_emmc.c
View file

@ -33,6 +33,10 @@ void nx_emmc_gpt_parse(link_t *gpt, sdmmc_storage_t *storage)
sdmmc_storage_read(storage, NX_GPT_FIRST_LBA, NX_GPT_NUM_BLOCKS, gpt_buf); sdmmc_storage_read(storage, NX_GPT_FIRST_LBA, NX_GPT_NUM_BLOCKS, gpt_buf);
// Check if no GPT or more than max allowed entries.
if (memcmp(&gpt_buf->header.signature, "EFI PART", 8) || gpt_buf->header.num_part_ents > 128)
goto out;
for (u32 i = 0; i < gpt_buf->header.num_part_ents; i++) for (u32 i = 0; i < gpt_buf->header.num_part_ents; i++)
{ {
emmc_part_t *part = (emmc_part_t *)calloc(sizeof(emmc_part_t), 1); emmc_part_t *part = (emmc_part_t *)calloc(sizeof(emmc_part_t), 1);
@ -53,6 +57,7 @@ void nx_emmc_gpt_parse(link_t *gpt, sdmmc_storage_t *storage)
list_append(gpt, &part->link); list_append(gpt, &part->link);
} }
out:
free(gpt_buf); free(gpt_buf);
} }