From nobody Mon Feb 9 09:28:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1627031175; cv=none; d=zohomail.com; s=zohoarc; b=fjCrYCUd2yXUR5NER6oMhj2Eo7tbGWLpUElomBrhAiO/3tp0SqzBL4r9FUcMn7blspanMnfAec8MoMBAClAz2ODVXbXsV6IRB1jmARyEH8RzkMAxnlvB/GHgC//kZeXOVYL0NQUTCQ0+XihyRuN58djwyJGc+ub2ka78wDacmbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627031175; 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; bh=aHsi/z88XTX37BzBxPwB5xsGcVXCuUNAJX0dZpKD+mc=; b=SHugPWuy9HlwpqnFrDBHBsvQ4T9KR+PXkN3actUkMDOXSwBM+JRjyRHLCeGQ2EZrUvHXOxm1Xs3WaphEZXRjlV7wa907kEUSlqppWXSIbNm3IotWEmmCgXrHVhzPYSV53p++KQ14Wb163GKzwSJw0Vz57enRx0bLDoVNQXCziec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162703117596552.85702968442274; Fri, 23 Jul 2021 02:06:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-570-IeDW0l4ePSW954dWngucLA-1; Fri, 23 Jul 2021 05:06:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B137C800EB8; Fri, 23 Jul 2021 09:06:07 +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 951A5604CC; Fri, 23 Jul 2021 09:06:07 +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 607C64A7CB; Fri, 23 Jul 2021 09:06:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16N963Zn019594 for ; Fri, 23 Jul 2021 05:06:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 27F7460939; Fri, 23 Jul 2021 09:06:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8364560853 for ; Fri, 23 Jul 2021 09:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627031175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=aHsi/z88XTX37BzBxPwB5xsGcVXCuUNAJX0dZpKD+mc=; b=cxZWp1jhZzZ9POOxcLUT2ha+JOHp1Jt0Qvt7Ce7Y+QVLJ3zpIrYn4AsDERHkhN4C9mQNqS Wdh7wrrIrgymeza0yohgYfnFzU2GNY/0S4HQeDwRYINrjwVw48EtxvnnxRFt2kxiYvyFuV FuMpTbRssE9iv8kMhT9Chf0gdLtqfhk= X-MC-Unique: IeDW0l4ePSW954dWngucLA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 7/7] qemuDomainObjPrivateAlloc: Fix unlikely memory leak Date: Fri, 23 Jul 2021 11:05:50 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1627031177186100001 Content-Type: text/plain; charset="utf-8" Additional cleanup paths add the possibility of not freeing earlier stuff. Add an AUTOPTR handler for qemuDomainObjPrivate and use it in qemuDomainObjPrivateAlloc Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8d1ecc0140..7e2efc8168 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1891,22 +1891,22 @@ qemuDomainObjPrivateFree(void *data) g_free(priv); } +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuDomainObjPrivate, qemuDomainObjPrivateFr= ee); + static void * qemuDomainObjPrivateAlloc(void *opaque) { - qemuDomainObjPrivate *priv; - - priv =3D g_new0(qemuDomainObjPrivate, 1); + g_autoptr(qemuDomainObjPrivate) priv =3D g_new0(qemuDomainObjPrivate, = 1); if (qemuDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks) < 0) { virReportSystemError(errno, "%s", _("Unable to init qemu driver mutexes")); - goto error; + return NULL; } if (!(priv->devs =3D virChrdevAlloc())) - goto error; + return NULL; priv->blockjobs =3D virHashNew(virObjectFreeHashData); @@ -1915,11 +1915,7 @@ qemuDomainObjPrivateAlloc(void *opaque) priv->migMaxBandwidth =3D QEMU_DOMAIN_MIG_BANDWIDTH_MAX; priv->driver =3D opaque; - return priv; - - error: - VIR_FREE(priv); - return NULL; + return g_steal_pointer(&priv); } --=20 2.31.1