platform: msm_shared: Change to read of partition entries in single buffer.
Presently partition entries are read and validated, and again
read to fill internal partition data.
This change ensure, we don't re-read partition entries instead,
use same buffer to fill that was used for validation.
Issue: SEC-2749
Change-Id: I5e272a0751fccf0ca145ee3445deaf15c8a4481a
(cherry picked from commit 07f7ca695e956d132ee002f4e14a686302891fcb)
diff --git a/platform/msm_shared/partition_parser.c b/platform/msm_shared/partition_parser.c
index e7fb0e5..3f678b5 100644
--- a/platform/msm_shared/partition_parser.c
+++ b/platform/msm_shared/partition_parser.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2013, 2015 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2013, 2015, 2018 The Linux Foundation. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -85,6 +85,8 @@
struct partition_entry *partition_entries;
static unsigned gpt_partitions_exist = 0;
static unsigned partition_count;
+/* this is a pointer to ptn_entries_buffer */
+static unsigned char *new_buffer = NULL;
unsigned int partition_read_table()
{
@@ -260,9 +262,9 @@
unsigned int n = 0; /* Counter for UTF-16 -> 8 conversion */
unsigned char UTF16_name[MAX_GPT_NAME_SIZE];
/* LBA of first partition -- 1 Block after Protected MBR + 1 for PT */
- unsigned long long partition_0;
uint64_t device_density;
uint8_t *data = NULL;
+ uint8_t *data_org_ptr = NULL;
uint32_t part_entry_cnt = block_size / ENTRY_SIZE;
/* Get the density of the mmc device */
@@ -276,6 +278,7 @@
ret = -1;
goto end;
}
+ data_org_ptr = data;
/* Print out the GPT first */
ret = mmc_read(block_size, (unsigned int *)data, block_size);
@@ -317,19 +320,11 @@
}
parse_secondary_gpt = 0;
}
- partition_0 = GET_LLWORD_FROM_BYTE(&data[PARTITION_ENTRIES_OFFSET]);
/* Read GPT Entries */
for (i = 0; i < (ROUNDUP(max_partition_count, part_entry_cnt)) / part_entry_cnt; i++) {
ASSERT(partition_count < NUM_PARTITIONS);
- ret = mmc_read((partition_0 * block_size) + (i * block_size),
- (uint32_t *) data, block_size);
-
- if (ret) {
- dprintf(CRITICAL,
- "GPT: mmc read card failed reading partition entries.\n");
- goto end;
- }
-
+
+ data = (new_buffer + (i * block_size));
for (j = 0; j < part_entry_cnt; j++) {
memcpy(&(partition_entries[partition_count].type_guid),
&data[(j * partition_entry_size)],
@@ -381,8 +376,10 @@
}
}
end:
- if (data)
- free(data);
+ if (data_org_ptr)
+ free(data_org_ptr);
+ if (new_buffer)
+ free(new_buffer);
return ret;
}
@@ -1023,7 +1020,6 @@
uint32_t ret = 0;
uint32_t partitions_for_block = 0;
uint32_t blocks_to_read = 0;
- unsigned char *new_buffer = NULL;
unsigned long long last_usable_lba = 0;
unsigned long long partition_0 = 0;
unsigned long long current_lba = 0;
@@ -1137,6 +1133,7 @@
dprintf(CRITICAL,"Partition entires crc mismatch crc_val= %u with crc_val_org= %u\n",crc_val,crc_val_org);
ret = 1;
}
+ return ret;
}
fail:
free(new_buffer);