External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: fix leaking of allocated migration ports

Browse Source 
Although the migration port is immediately released in the
finish phase of migration, it was never set in the domain
private object when allocated in the prepare phase. So
libxlDomainMigrationFinish() always released a 0-initialized
migrationPort, leaking any allocated port. After enough
migrations to exhaust the migration port pool, migration would
fail with

error: internal error: Unable to find an unused port in range
       'migration' (49152-49216)

Fix it by setting libxlDomainObjPrivate->migrationPort to the
port allocated in the prepare phase. While at it, also fix
leaking an allocated port if the prepare phase fails.
This commit is contained in:
Jim Fehlig 2016-10-14 11:55:52 -06:00
parent c1be22f971
commit f830674bf3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libxl/libxl_migration.c
View File

@ -594,6 +594,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn,
if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0)
goto error;
priv->migrationPort = port;
if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0)
goto error;
} else {
@ -628,6 +629,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn,
if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0)
goto error;
priv->migrationPort = port;
} else {
port = uri->port;
}
@ -690,6 +692,8 @@ libxlDomainMigrationPrepare(virConnectPtr dconn,
}
VIR_FREE(socks);
virObjectUnref(args);
virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort);
priv->migrationPort = 0;
/* Remove virDomainObj from domain list */
if (vm) {