External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix leak in qemuStringToArgvEnv upon OOM

Browse Source 
The 'qemuStringToArgvEnv' method splits up a string of command
line env/args to an 'arglist' array. It then copies env vars
to a 'progenv' array and args to a 'progargv' array. When
copyin the env vars, it NULL-ifies the element in 'arglist'
that is copied.

Upon OOM the 'virStringListFree' is called on progenv and
arglist. Unfortunately, because the elements in 'arglist'
related to env vars have been set to NULL, the call to
virStringListFree(arglist) doesn't free anything, even
though some non-NULL args vars still exist later in the
array.

To fix this leak, stop NULL-ifying the 'arglist' elements,
and change the cleanup code to only free elements in the
'arglist' array, not 'progenv'.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-09-24 16:34:06 +01:00
parent 6bb7f19eb1
commit b391b19144
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_command.c
View File

@ -9819,10 +9819,8 @@ static int qemuStringToArgvEnv(const char *args,
if (envend > 0) {
if (VIR_REALLOC_N(progenv, envend+1) < 0)
goto error;
for (i = 0; i < envend; i++) {
for (i = 0; i < envend; i++)
progenv[i] = arglist[i];
arglist[i] = NULL;
}
progenv[i] = NULL;
}
@ -9841,7 +9839,8 @@ static int qemuStringToArgvEnv(const char *args,
return 0;
error:
virStringFreeList(progenv);
VIR_FREE(progenv);
VIR_FREE(progargv);
virStringFreeList(arglist);
return -1;
}