OpenE2K
/
dwarves
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

btf_loader: Fix some memory leaks found by covscan 

Error: RESOURCE_LEAK (CWE-772):
  dwarves-1.21/btf_loader.c:554: alloc_fn: Storage is returned from allocation function "btf_elf__new".
  dwarves-1.21/btf_loader.c:554: var_assign: Assigning: "btfe" = storage returned from "btf_elf__new(filename, NULL, base_btf)".
  dwarves-1.21/btf_loader.c:561: leaked_storage: Variable "btfe" going out of scope leaks the storage it points to.
  #  559|         struct cu *cu = cu__new(filename, btfe->wordsize, NULL, 0, filename);
  #  560|         if (cu == NULL)
  #  561|->               return -1;
  #  562|
  #  563|         cu->language = LANG_C;

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2021-05-17 16:37:07 -03:00
parent 674063b1ea
commit cba940fb86
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
btf_loader.c
View File

@ -550,7 +550,7 @@ struct debug_fmt_ops btf_elf__ops;
int btf_elf__load_file(struct cus *cus, struct conf_load *conf, const char *filename)
{
int err;
int err = -1;
struct btf_elf *btfe = btf_elf__new(filename, NULL, base_btf);
if (btfe == NULL)
@ -558,7 +558,7 @@ int btf_elf__load_file(struct cus *cus, struct conf_load *conf, const char *file
struct cu *cu = cu__new(filename, btfe->wordsize, NULL, 0, filename);
if (cu == NULL)
return -1;
goto out_free_btf_elf;
cu->language = LANG_C;
cu->uses_global_strings = false;
@ -566,15 +566,14 @@ int btf_elf__load_file(struct cus *cus, struct conf_load *conf, const char *file
cu->dfops = &btf_elf__ops;
cu->priv = btfe;
btfe->priv = cu;
if (btf_elf__load(btfe) != 0)
return -1;
err = btf_elf__load(btfe);
if (err != 0)
goto out_free_cu;
err = btf_elf__load_sections(btfe);
if (err != 0) {
cu__delete(cu);
return err;
}
if (err != 0)
goto out_free_cu;
err = cu__fixup_btf_bitfields(cu, btfe);
/*
@ -586,6 +585,17 @@ int btf_elf__load_file(struct cus *cus, struct conf_load *conf, const char *file
cus__add(cus, cu);
return err;
out_free_cu:
cu__delete(cu);
/*
* cu__delete() calls the per-debugginf format destructor,
* btf_elf__cu_delete() in this case, and it calls btf_elf__delete(cu->priv).
*/
btfe = NULL;
out_free_btf_elf:
btf_elf__delete(btfe);
return err;
}
struct debug_fmt_ops btf_elf__ops = {