From: Ján Tomko Date: Mon, 21 Jan 2019 14:49:23 +0000 (+0100) Subject: virPortAllocatorSetUsed: ignore port 0 X-Git-Tag: v5.1.0-rc1~372 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2a8256991d772323a3df08c33b012bf12d62645;p=thirdparty%2Flibvirt.git virPortAllocatorSetUsed: ignore port 0 Similar to what commit 86dba8f3 did for virPortAllocatorRelease, ignore port 0 in virPortAllocatorSetUsed. For all the reasonable use cases the callers already check that the port is non-zero, however if the port from the XML overflows unsigned short and turns into 0, it can be set as used by virPortAllocatorSetUsed but not released by virPortAllocatorRelease. Also skip port '0' in virPortAllocatorSetUsed to make this behavior symmetric. The serenity was disturbed by commit 5dbda5e9 which started using virPortAllocatorRelease instead of virPortAllocatorSetUsed (false). https://bugzilla.redhat.com/show_bug.cgi?id=1591645 Signed-off-by: Ján Tomko Reviewed-by: Cole Robinson --- diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index db95a601c7..d48963c1ff 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -294,6 +294,9 @@ virPortAllocatorSetUsed(unsigned short port) if (!pa) return -1; + if (!port) + return 0; + virObjectLock(pa); if (virBitmapIsBitSet(pa->bitmap, port) ||