Allocate struct partition_desc in parser rather than in the core. Doing so allows the efi/dos partition code to embed the struct partition_desc is a efi/dos specific struct type.
Signed-off-by: Sascha Hauer <[email protected]> --- common/partitions.c | 10 ++++++---- common/partitions/dos.c | 14 ++++++++++++-- common/partitions/efi.c | 14 ++++++++++++-- common/partitions/parser.h | 3 ++- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/common/partitions.c b/common/partitions.c index cfcd0e080b..05ebde7ca3 100644 --- a/common/partitions.c +++ b/common/partitions.c @@ -113,13 +113,12 @@ static struct partition_parser *partition_parser_get_by_filetype(uint8_t *buf) */ int parse_partition_table(struct block_device *blk) { - struct partition_desc *pdesc; + struct partition_desc *pdesc = NULL; int i; int rc = 0; struct partition_parser *parser; uint8_t *buf; - pdesc = xzalloc(sizeof(*pdesc)); buf = malloc(2 * SECTOR_SIZE); rc = block_read(blk, buf, 0, 2); @@ -132,7 +131,9 @@ int parse_partition_table(struct block_device *blk) if (!parser) goto on_error; - parser->parse(buf, blk, pdesc); + pdesc = parser->parse(buf, blk); + if (!pdesc) + goto on_error; if (!pdesc->used_entries) goto on_error; @@ -150,7 +151,8 @@ int parse_partition_table(struct block_device *blk) on_error: free(buf); - free(pdesc); + if (pdesc) + parser->partition_free(pdesc); return rc; } diff --git a/common/partitions/dos.c b/common/partitions/dos.c index 56ec1e3f48..01a251201e 100644 --- a/common/partitions/dos.c +++ b/common/partitions/dos.c @@ -171,8 +171,7 @@ static void dos_extended_partition(struct block_device *blk, struct partition_de * It seems at least on ARM this routine cannot use temp. stack space for the * sector. So, keep the malloc/free. */ -static void dos_partition(void *buf, struct block_device *blk, - struct partition_desc *pd) +static struct partition_desc *dos_partition(void *buf, struct block_device *blk) { struct partition_entry *table; struct partition pentry; @@ -181,6 +180,7 @@ static void dos_partition(void *buf, struct block_device *blk, int i; struct disk_signature_priv *dsp; uint32_t signature = get_unaligned_le32(buf + 0x1b8); + struct partition_desc *pd; if (signature) sprintf(blk->cdev.diskuuid, "%08x", signature); @@ -189,6 +189,8 @@ static void dos_partition(void *buf, struct block_device *blk, table = (struct partition_entry *)&buffer[446]; + pd = xzalloc(sizeof(*pd)); + for (i = 0; i < 4; i++) { int n; @@ -244,10 +246,18 @@ static void dos_partition(void *buf, struct block_device *blk, dev_add_param_uint32(blk->dev, "nt_signature", dos_set_disk_signature, dos_get_disk_signature, &dsp->signature, "%08x", dsp); + + return pd; +} + +static void dos_partition_free(struct partition_desc *pd) +{ + free(pd); } static struct partition_parser dos = { .parse = dos_partition, + .partition_free = dos_partition_free, .type = filetype_mbr, }; diff --git a/common/partitions/efi.c b/common/partitions/efi.c index d0e14d5abb..effe512949 100644 --- a/common/partitions/efi.c +++ b/common/partitions/efi.c @@ -431,14 +431,14 @@ static void part_set_efi_name(gpt_entry *pte, char *dest) dest[i] = 0; } -static void efi_partition(void *buf, struct block_device *blk, - struct partition_desc *pd) +static struct partition_desc *efi_partition(void *buf, struct block_device *blk) { gpt_header *gpt = NULL; gpt_entry *ptes = NULL; int i = 0; int nb_part; struct partition *pentry; + struct partition_desc *pd; if (!find_valid_gpt(buf, blk, &gpt, &ptes) || !gpt || !ptes) goto out; @@ -456,6 +456,8 @@ static void efi_partition(void *buf, struct block_device *blk, nb_part = MAX_PARTITION; } + pd = xzalloc(sizeof(*pd)); + for (i = 0; i < nb_part; i++) { if (!is_pte_valid(&ptes[i], last_lba(blk))) { dev_dbg(blk->dev, "Invalid pte %d\n", i); @@ -474,10 +476,18 @@ static void efi_partition(void *buf, struct block_device *blk, out: kfree(gpt); kfree(ptes); + + return pd; +} + +static void efi_partition_free(struct partition_desc *pd) +{ + free(pd); } static struct partition_parser efi_partition_parser = { .parse = efi_partition, + .partition_free = efi_partition_free, .type = filetype_gpt, }; diff --git a/common/partitions/parser.h b/common/partitions/parser.h index 9cc41a7573..3eec2cdb21 100644 --- a/common/partitions/parser.h +++ b/common/partitions/parser.h @@ -32,7 +32,8 @@ struct partition_desc { }; struct partition_parser { - void (*parse)(void *buf, struct block_device *blk, struct partition_desc *pd); + struct partition_desc *(*parse)(void *buf, struct block_device *blk); + void (*partition_free)(struct partition_desc *pd); enum filetype type; struct list_head list; -- 2.39.2
