From nobody Sat May 4 19:41:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560879706; cv=none; d=zoho.com; s=zohoarc; b=LS38foE5XQpN3NGwzg8zlOVJtY45jyfU2pJPjhAhpttO22M75XqQpydWYUXH00RRJCJrIPMFlTx0ZFlCSglB0GaAqIJVFswsD2Hqzh/mL4fof5gZwja9LFYDiQgaWJM3DAg8CekRK6ugB/APFYEy7i4hdBcU5oMWz4Ko/LA0RQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560879706; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=6zEGrWnIxfiAHN0lNaotjz6kO1qBuXOkiHmSrLFZvGk=; b=ghYvfPIFSlyOj9g6yC34Wr7zbLo9/yb8LwogzV7n7rAWZpaGe6uiM2/NzNpR1ZH7O4jt1cAmeGXF9kbIAvDa5okw253lUTn061s4b9N3vARyu9/dzIMuW9Tcz8WvaRg2CS+1WSwpPfKYSZrwCDLxIPtH3ZPCEPqTTWL87VFQrl0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560879706449459.02566451585267; Tue, 18 Jun 2019 10:41:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 63E6C8830B; Tue, 18 Jun 2019 17:40:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 76F3D5786; Tue, 18 Jun 2019 17:40:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 35F99206D3; Tue, 18 Jun 2019 17:40:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IHdWEd009135 for ; Tue, 18 Jun 2019 13:39:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 75A4B1001DEE; Tue, 18 Jun 2019 17:39:32 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 685321001DDC; Tue, 18 Jun 2019 17:39:29 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 18:39:18 +0100 Message-Id: <20190618173921.22902-2-berrange@redhat.com> In-Reply-To: <20190618173921.22902-1-berrange@redhat.com> References: <20190618173921.22902-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/4] conf: fix leak when parsing network port XML X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 18 Jun 2019 17:41:43 +0000 (UTC) Use auto free to avoid leaking the "trustGuestRxFilters" strings Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Ferlan --- src/conf/virnetworkportdef.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 379411e088..5dfa3a3583 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -76,19 +76,19 @@ static virNetworkPortDefPtr virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) { virNetworkPortDefPtr def; - char *uuid =3D NULL; + VIR_AUTOFREE(char *) uuid =3D NULL; xmlNodePtr virtPortNode; xmlNodePtr vlanNode; xmlNodePtr bandwidthNode; xmlNodePtr addressNode; - char *trustGuestRxFilters =3D NULL; - char *mac =3D NULL; - char *macmgr =3D NULL; - char *mode =3D NULL; - char *plugtype =3D NULL; - char *managed =3D NULL; - char *driver =3D NULL; - char *class_id =3D NULL; + VIR_AUTOFREE(char *) trustGuestRxFilters =3D NULL; + VIR_AUTOFREE(char *) mac =3D NULL; + VIR_AUTOFREE(char *) macmgr =3D NULL; + VIR_AUTOFREE(char *) mode =3D NULL; + VIR_AUTOFREE(char *) plugtype =3D NULL; + VIR_AUTOFREE(char *) managed =3D NULL; + VIR_AUTOFREE(char *) driver =3D NULL; + VIR_AUTOFREE(char *) class_id =3D NULL; =20 if (VIR_ALLOC(def) < 0) return NULL; @@ -255,14 +255,6 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) } =20 cleanup: - VIR_FREE(class_id); - VIR_FREE(uuid); - VIR_FREE(plugtype); - VIR_FREE(mac); - VIR_FREE(mode); - VIR_FREE(macmgr); - VIR_FREE(driver); - VIR_FREE(managed); return def; =20 error: --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 19:41:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560881958; cv=none; d=zoho.com; s=zohoarc; b=lR/RqaQTa+P64aklkLV1jiWrE9nBEfst8n8mKBT0SmVYY6BEEB8ISI24NyPAic2HiyUyh//JPpJdRSXnF7BGnWihrHFgZlixybVBJvefNV6f2xrRwQqEpil5o6w2vr/Ei+SDgakdpxa/sw9JGpdj7An4h2WHq+lujVhtQywfs4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560881958; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=/herruVA9WrzNlZ2n6xghVPFAp3g8BR7LvCv8iXqB90=; b=E/JqUHUgO9Fz02lNmihpaw60pxCyDlXGDpx27BhlHlRiwBv7BZKUHwNKmP9FZG/9jTtYaR2frPpAPmwDLVoEuXMdRXeDZHBAnikkOUlBSwUFapgRpsK5UeeKpaonWSWjv8EuO6zY5MwwSIELo2iefPDosmThl8ycxvXNZL4i+ro= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156088195877266.51460270119583; Tue, 18 Jun 2019 11:19:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A873C04B2F6; Tue, 18 Jun 2019 18:18:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA1AF1001E6F; Tue, 18 Jun 2019 18:18:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4A30424AFA; Tue, 18 Jun 2019 18:18:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IHdZav009146 for ; Tue, 18 Jun 2019 13:39:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1D30D1001DCD; Tue, 18 Jun 2019 17:39:35 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36AAE1001DEE; Tue, 18 Jun 2019 17:39:32 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 18:39:19 +0100 Message-Id: <20190618173921.22902-3-berrange@redhat.com> In-Reply-To: <20190618173921.22902-1-berrange@redhat.com> References: <20190618173921.22902-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/4] conf: fix leak of directory handle when loading network ports X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 18 Jun 2019 18:19:17 +0000 (UTC) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Ferlan --- src/conf/virnetworkobj.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 47c142998e..ed1f02f4c5 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1750,6 +1750,7 @@ virNetworkObjDeleteAllPorts(virNetworkObjPtr net, =20 ret =3D 0; cleanup: + VIR_DIR_CLOSE(dh); return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 19:41:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560879727; cv=none; d=zoho.com; s=zohoarc; b=QQrnzgxyusCQbJ+pBWAQvz0tsG0+VlvV7ZykVTP8RITBQ9CVQINhMoVZ2lIAZdsTQwq82NQfD9ULw2/syv225jA+QoYoM25XwCPqMhJUJDTRjrlVasD5Nxd07oqrrTLWskRJ4BdASlaI3SiTHkklRuSRpwcJsiH1rVOs0lqeQNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560879727; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Ih2GhQZlpQHyAUW6HOeWP+ct/CDYV3LWNs5Dsq0xybY=; b=oW9vLvzy98OrZzGYVGeMiYGBtylZeN1HNru2QJN6Ri+YcBapQm0LZS49D1CoACy1/XIYtY4LMGBV2eiQ+FEULPsPYYLW5bOiPG9hYs6TE9D0mESxJUYkkdE8Q55II72S6AMOOz1fbqoKM8VftN+ypmRJjMhVnAEdpBg65EMxtn0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560879727273248.30072182475715; Tue, 18 Jun 2019 10:42:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 99FCA356F6; Tue, 18 Jun 2019 17:41:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 298C65F1B7; Tue, 18 Jun 2019 17:41:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EFD591806B19; Tue, 18 Jun 2019 17:41:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IHde0d009175 for ; Tue, 18 Jun 2019 13:39:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 754481001B34; Tue, 18 Jun 2019 17:39:40 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BFA91001DDC; Tue, 18 Jun 2019 17:39:35 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 18:39:20 +0100 Message-Id: <20190618173921.22902-4-berrange@redhat.com> In-Reply-To: <20190618173921.22902-1-berrange@redhat.com> References: <20190618173921.22902-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 3/4] conf: fix NULL deref when exporting ports X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 18 Jun 2019 17:42:06 +0000 (UTC) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Ferlan --- src/conf/virnetworkobj.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index ed1f02f4c5..fd4bf779b9 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1810,10 +1810,12 @@ virNetworkObjPortListExport(virNetworkPtr net, }; int ret =3D -1; =20 - *ports =3D NULL; + if (ports) { + *ports =3D NULL; =20 - if (ports && VIR_ALLOC_N(data.ports, virHashSize(obj->ports) + 1) < 0) - goto cleanup; + if (VIR_ALLOC_N(data.ports, virHashSize(obj->ports) + 1) < 0) + goto cleanup; + } =20 virHashForEach(obj->ports, virNetworkObjPortListExportCallback, &data); =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 19:41:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560879729; cv=none; d=zoho.com; s=zohoarc; b=A6oD8ZNZgkSF/e2Hkw4YTRqjQB4oZiAFNLfY4hI2CYxoQ9YOhSBRNRVxGL/S9y26XCIPqDUb04W2AIzMZL8OeUJIoeXo/BasEB9l273vF1au/pz5GgActSPbe0el9e/vXLf/0kbBnpeZmlUpGjJrmDbIZucLnDhbl2XomFQ5oJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560879729; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=QFH27qoxB14OPKbnEZTVaflA9/oynR6/HZf5VtVL0No=; b=FYSBxu2pSGGJNTZcyV2HLvVpLd/JtUfziytFXR/twpvDkkNfXcg0gxD53mesFwPRd/V2575tfPKep5d5a2pd+uPOzO5J+Xk7gZrhwu9cwazPwG6PNjFHmt9Yv/u/OhgMudlcixgttHvG5JsdZXcO15uRL1kfmqkeb/wqFZ2lEvg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156087972912014.477787332239927; Tue, 18 Jun 2019 10:42:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 783BA81114; Tue, 18 Jun 2019 17:42:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 518055C2E6; Tue, 18 Jun 2019 17:41:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0A5ED206D5; Tue, 18 Jun 2019 17:41:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IHdfM4009193 for ; Tue, 18 Jun 2019 13:39:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC8371001B12; Tue, 18 Jun 2019 17:39:41 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4D141001DCD; Tue, 18 Jun 2019 17:39:40 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 18:39:21 +0100 Message-Id: <20190618173921.22902-5-berrange@redhat.com> In-Reply-To: <20190618173921.22902-1-berrange@redhat.com> References: <20190618173921.22902-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 4/4] conf: add error checking of UUID generation X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 18 Jun 2019 17:42:08 +0000 (UTC) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Ferlan --- src/conf/domain_conf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ee651e7742..c69d382d70 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30415,7 +30415,11 @@ virDomainNetDefToNetworkPort(virDomainDefPtr dom, if (VIR_ALLOC(port) < 0) return NULL; =20 - virUUIDGenerate(port->uuid); + if (virUUIDGenerate(port->uuid) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to generate UUID")); + goto error; + } =20 memcpy(port->owneruuid, dom->uuid, VIR_UUID_BUFLEN); if (VIR_STRDUP(port->ownername, dom->name) < 0) @@ -30576,7 +30580,11 @@ virDomainNetDefActualToNetworkPort(virDomainDefPtr= dom, return NULL; =20 /* Bad - we need to preserve original port uuid */ - virUUIDGenerate(port->uuid); + if (virUUIDGenerate(port->uuid) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to generate UUID")); + goto error; + } =20 memcpy(port->owneruuid, dom->uuid, VIR_UUID_BUFLEN); if (VIR_STRDUP(port->ownername, dom->name) < 0) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list