From nobody Mon Feb 9 04:44:14 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617985150; cv=none; d=zohomail.com; s=zohoarc; b=eObnz2y/jN58Y9G47gMBLBWb1NAKTV9gDSuWJ/4EMx/Y+fczc9qvRnn32dojwrhkJNgSbq+yrek8bVjub0uHacDN1a3OcEfqcUYjZBS1KvZVyNLlA15Tc4bfGKjsaibKSPb01S7A29KzlUBCPhT0+sGZMCmsIRBbrhy6bcN+F4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617985150; h=Content-Type:Content-Transfer-Encoding:Cc: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=5xWuU0hBtpAwHuQvWGIwrd39FN93VworOtiulnbrtDI=; b=WHfgGCQFkGuCog+dtGFR3bla5tMd4E/UEHaeQoRZQPGietopxNewdAw6O9lv7Onk9aYvVYgBlyADvs+CfTpTpvAzDlAXMmv9UXhsQzCM/g+pZMIXLK7Drr/7sBHGuS7NyplO/NJeTV6GliDyU3EfwHUzKEyhbSlXdUs1C0LREQI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617985150589525.3424052365715; Fri, 9 Apr 2021 09:19:10 -0700 (PDT) Received: from localhost ([::1]:59856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUtqf-0002gO-GO for importer@patchew.org; Fri, 09 Apr 2021 12:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUtnh-0007Qh-BV for qemu-devel@nongnu.org; Fri, 09 Apr 2021 12:16:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUtnf-0003Jl-LM for qemu-devel@nongnu.org; Fri, 09 Apr 2021 12:16:05 -0400 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-249-eieJM6hNPCKiqK3uOXuqNA-1; Fri, 09 Apr 2021 12:16:00 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73B1A10CE780; Fri, 9 Apr 2021 16:15:59 +0000 (UTC) Received: from merkur.fritz.box (ovpn-115-63.ams2.redhat.com [10.36.115.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 712665D6A1; Fri, 9 Apr 2021 16:15:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617984962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5xWuU0hBtpAwHuQvWGIwrd39FN93VworOtiulnbrtDI=; b=aulmUSAVYrYbe5s/tOvp95G/vjvK2yD1Mm6pS5DrYNKUoPRiX2Jx6HqsYGcgxD6VZD9sSo qnaNxVhQ6v2pE2DAb7RQOlBfLegsiZxgMhEai3d4kP7tdogQPXfBNBEMm1QI8nOoeLQrHM +ASwLyIu/pIo/s5ir+W7/Nt6w929OJk= X-MC-Unique: eieJM6hNPCKiqK3uOXuqNA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 01/10] block/rbd: fix memory leak in qemu_rbd_connect() Date: Fri, 9 Apr 2021 18:15:39 +0200 Message-Id: <20210409161548.341297-2-kwolf@redhat.com> In-Reply-To: <20210409161548.341297-1-kwolf@redhat.com> References: <20210409161548.341297-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella In qemu_rbd_connect(), 'mon_host' is allocated by qemu_rbd_mon_host() using g_strjoinv(), but it's only freed in the error path, leaking memory in the success path as reported by valgrind: 80 bytes in 4 blocks are definitely lost in loss record 5,028 of 6,516 at 0x4839809: malloc (vg_replace_malloc.c:307) by 0x5315BB8: g_malloc (in /usr/lib64/libglib-2.0.so.0.6600.8) by 0x532B6FF: g_strjoinv (in /usr/lib64/libglib-2.0.so.0.6600.8) by 0x87D07E: qemu_rbd_mon_host (rbd.c:538) by 0x87D07E: qemu_rbd_connect (rbd.c:562) by 0x87E1CE: qemu_rbd_open (rbd.c:740) by 0x840EB1: bdrv_open_driver (block.c:1528) by 0x8453A9: bdrv_open_common (block.c:1802) by 0x8453A9: bdrv_open_inherit (block.c:3444) by 0x8464C2: bdrv_open (block.c:3537) by 0x8108CD: qmp_blockdev_add (blockdev.c:3569) by 0x8EA61B: qmp_marshal_blockdev_add (qapi-commands-block-core.c:1086) by 0x90B528: do_qmp_dispatch_bh (qmp-dispatch.c:131) by 0x907EA4: aio_bh_poll (async.c:164) Fix freeing 'mon_host' also when qemu_rbd_connect() ends correctly. Fixes: 0a55679b4a5061f4d74bdb1a0e81611ba3390b00 Signed-off-by: Stefano Garzarella Message-Id: <20210329150129.121182-2-sgarzare@redhat.com> Reviewed-by: Markus Armbruster Reviewed-by: Max Reitz Signed-off-by: Kevin Wolf --- block/rbd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 9071a00e3f..24cefcd0dc 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -563,13 +563,13 @@ static int qemu_rbd_connect(rados_t *cluster, rados_i= octx_t *io_ctx, if (local_err) { error_propagate(errp, local_err); r =3D -EINVAL; - goto failed_opts; + goto out; } =20 r =3D rados_create(cluster, opts->user); if (r < 0) { error_setg_errno(errp, -r, "error initializing"); - goto failed_opts; + goto out; } =20 /* try default location when conf=3DNULL, but ignore failure */ @@ -626,11 +626,12 @@ static int qemu_rbd_connect(rados_t *cluster, rados_i= octx_t *io_ctx, */ rados_ioctx_set_namespace(*io_ctx, opts->q_namespace); =20 - return 0; + r =3D 0; + goto out; =20 failed_shutdown: rados_shutdown(*cluster); -failed_opts: +out: g_free(mon_host); return r; } --=20 2.30.2