External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Resource some resource leaks in virsysinfo code

Browse Source 
Calls to virFileReadAll after a VIR_ALLOC that return NULL all show
a memory leak since 'ret' isn't virSysinfoDefFree'd and normal path
"return ret" doesn't free outbuf.

Reported by Coverity

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-03-07 06:33:38 -05:00
parent ee42957bb1
commit 7744d99415
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/virsysinfo.c
View File

@ -270,7 +270,7 @@ virSysinfoReadPPC(void)
if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to open %s"), CPUINFO);
return NULL;
goto no_memory;
}
ret->nprocessor = 0;
@ -281,10 +281,12 @@ virSysinfoReadPPC(void)
if (virSysinfoParsePPCSystem(outbuf, &ret->system) < 0)
goto no_memory;
VIR_FREE(outbuf);
return ret;
no_memory:
VIR_FREE(outbuf);
virSysinfoDefFree(ret);
return NULL;
}
@ -402,7 +404,7 @@ virSysinfoReadARM(void)
if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to open %s"), CPUINFO);
return NULL;
goto no_memory;
}
ret->nprocessor = 0;
@ -413,10 +415,12 @@ virSysinfoReadARM(void)
if (virSysinfoParseARMSystem(outbuf, &ret->system) < 0)
goto no_memory;
VIR_FREE(outbuf);
return ret;
no_memory:
VIR_FREE(outbuf);
virSysinfoDefFree(ret);
return NULL;
}
@ -539,7 +543,7 @@ virSysinfoReadS390(void)
if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to open %s"), CPUINFO);
return NULL;
goto no_memory;
}
ret->nprocessor = 0;
@ -554,12 +558,13 @@ virSysinfoReadS390(void)
if (virFileReadAll(SYSINFO, 8192, &outbuf) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to open %s"), SYSINFO);
return NULL;
goto no_memory;
}
if (virSysinfoParseS390System(outbuf, &ret->system) < 0)
goto no_memory;
VIR_FREE(outbuf);
return ret;
no_memory: