From nobody Sun Feb 8 08:48:42 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 153535736240875.89598102998332; Mon, 27 Aug 2018 01:09:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E80705D5EE; Mon, 27 Aug 2018 08:09:19 +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 39ED93091323; Mon, 27 Aug 2018 08:09:19 +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 D8EAD181A13C; Mon, 27 Aug 2018 08:09:18 +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 w7R88tWW032420 for ; Mon, 27 Aug 2018 04:08:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id ED8BB2027056; Mon, 27 Aug 2018 08:08:54 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79D5E202704E for ; Mon, 27 Aug 2018 08:08:54 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 27 Aug 2018 10:08:20 +0200 Message-Id: <2cf3d487a3cfa21fd7e2ca9f8bb2d1b465d35d2e.1535356707.git.mprivozn@redhat.com> 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 v3 07/28] locking: Don't leak private data in virLockManagerLockDaemonNew 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.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 27 Aug 2018 08:09:21 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" If drvNew callback fails, nobody calls drvFree and thus private data of the driver might leak. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- src/locking/lock_driver_lockd.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 2574cd47e2..3012c71eda 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -377,16 +377,14 @@ static int virLockManagerLockDaemonDeinit(void) return 0; } =20 -static void virLockManagerLockDaemonFree(virLockManagerPtr lock) +static void +virLockManagerLockDaemonPrivateFree(virLockManagerLockDaemonPrivatePtr pri= v) { - virLockManagerLockDaemonPrivatePtr priv =3D lock->privateData; size_t i; =20 if (!priv) return; =20 - lock->privateData =3D NULL; - for (i =3D 0; i < priv->nresources; i++) { VIR_FREE(priv->resources[i].lockspace); VIR_FREE(priv->resources[i].name); @@ -394,10 +392,18 @@ static void virLockManagerLockDaemonFree(virLockManag= erPtr lock) VIR_FREE(priv->resources); =20 VIR_FREE(priv->name); - VIR_FREE(priv); } =20 +static void virLockManagerLockDaemonFree(virLockManagerPtr lock) +{ + if (!lock) + return; + + virLockManagerLockDaemonPrivateFree(lock->privateData); + lock->privateData =3D NULL; +} + =20 static int virLockManagerLockDaemonNew(virLockManagerPtr lock, unsigned int type, @@ -405,14 +411,14 @@ static int virLockManagerLockDaemonNew(virLockManager= Ptr lock, virLockManagerParamPtr params, unsigned int flags) { - virLockManagerLockDaemonPrivatePtr priv; + virLockManagerLockDaemonPrivatePtr priv =3D NULL; size_t i; + int ret =3D -1; =20 virCheckFlags(VIR_LOCK_MANAGER_NEW_STARTED, -1); =20 if (VIR_ALLOC(priv) < 0) return -1; - lock->privateData =3D priv; =20 switch (type) { case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN: @@ -421,7 +427,7 @@ static int virLockManagerLockDaemonNew(virLockManagerPt= r lock, memcpy(priv->uuid, params[i].value.uuid, VIR_UUID_BUFLEN); } else if (STREQ(params[i].key, "name")) { if (VIR_STRDUP(priv->name, params[i].value.str) < 0) - return -1; + goto cleanup; } else if (STREQ(params[i].key, "id")) { priv->id =3D params[i].value.iv; } else if (STREQ(params[i].key, "pid")) { @@ -432,24 +438,25 @@ static int virLockManagerLockDaemonNew(virLockManager= Ptr lock, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected parameter %s for object"), params[i].key); + goto cleanup; } } if (priv->id =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing ID parameter for domain object")); - return -1; + goto cleanup; } if (priv->pid =3D=3D 0) VIR_DEBUG("Missing PID parameter for domain object"); if (!priv->name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing name parameter for domain object")); - return -1; + goto cleanup; } if (!virUUIDIsValid(priv->uuid)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing UUID parameter for domain object")); - return -1; + goto cleanup; } break; =20 @@ -457,10 +464,14 @@ static int virLockManagerLockDaemonNew(virLockManager= Ptr lock, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown lock manager object type %d"), type); - return -1; + goto cleanup; } =20 - return 0; + VIR_STEAL_PTR(lock->privateData, priv); + ret =3D 0; + cleanup: + virLockManagerLockDaemonPrivateFree(priv); + return ret; } =20 =20 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list