From nobody Mon Feb 9 01:17:23 2026 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 1532523776658699.627973365193; Wed, 25 Jul 2018 06:02:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F26975F72B; Wed, 25 Jul 2018 13:02:54 +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 AFB9A5B681; Wed, 25 Jul 2018 13:02:54 +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 602114A46D; Wed, 25 Jul 2018 13:02:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6PD2gCt030436 for ; Wed, 25 Jul 2018 09:02:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id C257A2026DEF; Wed, 25 Jul 2018 13:02:42 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 635422026D68 for ; Wed, 25 Jul 2018 13:02:42 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 25 Jul 2018 15:02:11 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/5] lxc: Don't mangle @cfg refs in virLXCProcessBuildControllerCmd 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 25 Jul 2018 13:02:55 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The config object is refed but unrefed only on error which leaves refcount unbalanced on successful return. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/lxc/lxc_process.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 3e44da1aaf..d021a890f7 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -931,7 +931,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, filterstr =3D virLogGetFilters(); if (!filterstr) { virReportOOMError(); - goto cleanup; + goto error; } =20 virCommandAddEnvPair(cmd, "LIBVIRT_LOG_FILTERS", filterstr); @@ -943,7 +943,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, outputstr =3D virLogGetOutputs(); if (!outputstr) { virReportOOMError(); - goto cleanup; + goto error; } =20 virCommandAddEnvPair(cmd, "LIBVIRT_LOG_OUTPUTS", outputstr); @@ -973,7 +973,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, char *tmp =3D NULL; if (virAsprintf(&tmp, "--share-%s", nsInfoLocal[i]) < 0) - goto cleanup; + goto error; virCommandAddArg(cmd, tmp); virCommandAddArgFormat(cmd, "%d", nsInheritFDs[i]); virCommandPassFD(cmd, nsInheritFDs[i], 0); @@ -999,11 +999,13 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr drive= r, * write the live domain status XML with the PID */ virCommandRequireHandshake(cmd); =20 + cleanup: + virObjectUnref(cfg); return cmd; - cleanup: + error: virCommandFree(cmd); - virObjectUnref(cfg); - return NULL; + cmd =3D NULL; + goto cleanup; } =20 =20 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list