External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-08 14:29:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on OOM in qemuAddRBDHost

Browse Source 
When parsing the RBD hosts, it increments the 'nhosts' counter
before increasing the 'hosts' array allocation. If an OOM then
occurs when increasing the array allocation, the cleanup block
will attempt to access beyond the end of the array. Switch
to using VIR_EXPAND_N instead of VIR_REALLOC_N to protect against
this mistake

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-09-23 14:11:34 +01:00
parent ba19783d9b
commit 0bea528a33
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_command.c
View File

@ -3232,9 +3232,8 @@ static int qemuAddRBDHost(virDomainDiskDefPtr disk, char *hostport)
size_t skip; size_t skip;
char **parts; char **parts;
disk->nhosts++; if (VIR_EXPAND_N(disk->hosts, disk->nhosts, 1) < 0)
if (VIR_REALLOC_N(disk->hosts, disk->nhosts) < 0) return -1;
goto error;
if ((port = strchr(hostport, ']'))) { if ((port = strchr(hostport, ']'))) {
/* ipv6, strip brackets */ /* ipv6, strip brackets */