GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool/cbfs_image: Fix resource leak for segs 

Free segs whenever returning from cbfs_payload_make_elf()

Change-Id: I0dd722dd488723cecffe1f5621244bb0344056a6
Signed-off-by: Furquan Shaikh <furquan@google.com>
Found-by: Coverity Scan # 1361268
Reviewed-on: https://review.coreboot.org/16072
Tested-by: build bot (Jenkins)
Reviewed-by: Antonello Dettori <dev@dettori.io>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh 2016-08-05 08:20:37 -07:00 committed by Patrick Georgi
parent b927bec09a
commit 7b405178f4
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
util/cbfstool/cbfs_image.c
View File

@ -1046,14 +1046,15 @@ static int cbfs_payload_make_elf(struct buffer *buff, uint32_t arch)
{ {
Elf64_Ehdr ehdr; Elf64_Ehdr ehdr;
Elf64_Shdr shdr; Elf64_Shdr shdr;
struct cbfs_payload_segment *segs; struct cbfs_payload_segment *segs = NULL;
struct elf_writer *ew; struct elf_writer *ew;
struct buffer elf_out; struct buffer elf_out;
int segments = 0; int segments = 0;
int retval = -1;
if (arch == CBFS_ARCHITECTURE_UNKNOWN) { if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
ERROR("You need to specify -m ARCH.\n"); ERROR("You need to specify -m ARCH.\n");
return -1; goto out;
} }
/* Count the number of segments inside buffer */ /* Count the number of segments inside buffer */
@ -1083,7 +1084,7 @@ static int cbfs_payload_make_elf(struct buffer *buff, uint32_t arch)
} else { } else {
ERROR("Unknown payload segment type: %x\n", ERROR("Unknown payload segment type: %x\n",
payload_type); payload_type);
return -1; goto out;
} }
} }
@ -1092,24 +1093,23 @@ static int cbfs_payload_make_elf(struct buffer *buff, uint32_t arch)
/* Decode xdr segments */ /* Decode xdr segments */
for (int i = 0; i < segments; i++) { for (int i = 0; i < segments; i++) {
struct cbfs_payload_segment *serialized_seg = buffer_get(buff); struct cbfs_payload_segment *serialized_seg = buffer_get(buff);
xdr_get_seg(&segs[i], &serialized_seg[i]); xdr_get_seg(&segs[i], &serialized_seg[i]);
} }
if (cbfs_payload_decompress(segs, buff, segments)) { if (cbfs_payload_decompress(segs, buff, segments)) {
ERROR("Failed to decompress payload.\n"); ERROR("Failed to decompress payload.\n");
return -1; goto out;
} }
if (init_elf_from_arch(&ehdr, arch)) if (init_elf_from_arch(&ehdr, arch))
return -1; goto out;
ehdr.e_entry = segs[segments-1].load_addr; ehdr.e_entry = segs[segments-1].load_addr;
ew = elf_writer_init(&ehdr); ew = elf_writer_init(&ehdr);
if (ew == NULL) { if (ew == NULL) {
ERROR("Unable to init ELF writer.\n"); ERROR("Unable to init ELF writer.\n");
return -1; goto out;
} }
for (int i = 0; i < segments; i++) { for (int i = 0; i < segments; i++) {
@ -1158,8 +1158,7 @@ static int cbfs_payload_make_elf(struct buffer *buff, uint32_t arch)
if (elf_writer_add_section(ew, &shdr, &tbuff, name)) { if (elf_writer_add_section(ew, &shdr, &tbuff, name)) {
ERROR("Unable to add ELF section: %s\n", name); ERROR("Unable to add ELF section: %s\n", name);
elf_writer_destroy(ew); goto out;
return -1;
} }
if (empty_sz != 0) { if (empty_sz != 0) {
@ -1174,26 +1173,25 @@ static int cbfs_payload_make_elf(struct buffer *buff, uint32_t arch)
name = strdup(".empty"); name = strdup(".empty");
if (elf_writer_add_section(ew, &shdr, &b, name)) { if (elf_writer_add_section(ew, &shdr, &b, name)) {
ERROR("Unable to add ELF section: %s\n", name); ERROR("Unable to add ELF section: %s\n", name);
elf_writer_destroy(ew); goto out;
return -1;
} }
} }
} }
if (elf_writer_serialize(ew, &elf_out)) { if (elf_writer_serialize(ew, &elf_out)) {
ERROR("Unable to create ELF file from stage.\n"); ERROR("Unable to create ELF file from stage.\n");
elf_writer_destroy(ew); goto out;
return -1;
} }
/* Flip buffer with the created ELF one. */ /* Flip buffer with the created ELF one. */
buffer_delete(buff); buffer_delete(buff);
*buff = elf_out; *buff = elf_out;
retval = 0;
out:
free(segs);
elf_writer_destroy(ew); elf_writer_destroy(ew);
return retval;
return 0;
} }
int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,