From nobody Wed May 8 21:23:05 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1534152213310196.89188827028613; Mon, 13 Aug 2018 02:23:33 -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 4ED16C057F82; Mon, 13 Aug 2018 09:23:31 +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 DD91610694D6; Mon, 13 Aug 2018 09:23:30 +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 66CA418037ED; Mon, 13 Aug 2018 09:23:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7D9Lptg005332 for ; Mon, 13 Aug 2018 05:21:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id DD4A82142F21; Mon, 13 Aug 2018 09:21:51 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-61.brq.redhat.com [10.40.204.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FB762142F20 for ; Mon, 13 Aug 2018 09:21:51 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 13 Aug 2018 11:21:44 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] virnetdevip: Free data.devices in virNetDevIPCheckIPv6Forwarding() too 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: , MIME-Version: 1.0 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]); Mon, 13 Aug 2018 09:23:31 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We are freeing the individual strings (which were filled by virNetDevIPCheckIPv6ForwardingCallback()) but not the array itself. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/util/virnetdevip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index c6d6175627..866ddcc213 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -651,8 +651,7 @@ virNetDevIPCheckIPv6Forwarding(void) =20 cleanup: nlmsg_free(nlmsg); - for (i =3D 0; i < data.ndevices; i++) - VIR_FREE(data.devices[i]); + virStringListFreeCount(data.devices, data.ndevices); return valid; } =20 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 8 21:23:05 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1534152218988849.7321863958122; Mon, 13 Aug 2018 02:23:38 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11AD713A4D; Mon, 13 Aug 2018 09:23:36 +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 8BDDD5C20D; Mon, 13 Aug 2018 09:23:35 +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 3C7AB18037F1; Mon, 13 Aug 2018 09:23:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7D9LqZi005342 for ; Mon, 13 Aug 2018 05:21:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id BBA9E2142F21; Mon, 13 Aug 2018 09:21:52 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-61.brq.redhat.com [10.40.204.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BF6E2142F20 for ; Mon, 13 Aug 2018 09:21:52 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 13 Aug 2018 11:21:45 +0200 Message-Id: <02298a3341a100ca8d643e21acca033a7b381f2f.1534152046.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] networkStartNetworkVirtual: Don't leak macmap object 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: , MIME-Version: 1.0 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 13 Aug 2018 09:23:36 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When starting network a macmap object is created (which stores MAC -> domain name mappings). However, if something goes wrong (e.g. virNetDevIPCheckIPv6Forwarding() fails) then the object is leaked. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/network/bridge_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f92cc61e47..588b0d147d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2453,6 +2453,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr d= river, goto err1; =20 virNetworkObjSetMacMap(obj, macmap); + macmap =3D NULL; =20 /* Set bridge options */ =20 @@ -2590,6 +2591,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr d= river, ignore_value(virNetDevTapDelete(macTapIfName, NULL)); VIR_FREE(macTapIfName); } + virNetworkObjUnrefMacMap(obj); VIR_FREE(macMapFile); =20 err0: --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list