From nobody Mon Feb 9 14:02:50 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=1626785911; cv=none; d=zohomail.com; s=zohoarc; b=GCBq+hILc32yavRQpXUz0Bv7AaqknPZfsnMv3W0M8dpa9ob8ZNJouGnQHeC50xf+xiZszv6h27ZRVYydRBHeet4EPrj7e9BYAOlA6V1pbTWUr7Ys3PffkAAg1QGjgJiTEsKnDputAlu+GJ+5acmpnUyiDcbRSDkwIE9UYUqPBLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626785911; 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=tG45zN/Yo+X4/PVK2K1UnA3+Ntv2MO61J9bSokSZ6Cg=; b=TMCOPkchMzrOZui1NCkdS9nKjW/yFLQYHC06MIyREfpa83WN3r+y0JEsGP5DYqHcKHzANhQT3UO1R9vzeUlS0mGNpLeD4DLsVOld+f/FOcbehVjBpK6sYENtsCBYqwlIJhsPKqsSqgvDWQXfxwFtBNIIquC4RQp7SFAURNgORIk= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626785911452127.64326262038696; Tue, 20 Jul 2021 05:58:31 -0700 (PDT) Received: from localhost ([::1]:56446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5pKQ-00054S-DN for importer@patchew.org; Tue, 20 Jul 2021 08:58:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5pGQ-0004nz-Tb for qemu-devel@nongnu.org; Tue, 20 Jul 2021 08:54:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5pGN-0008Ho-7u for qemu-devel@nongnu.org; Tue, 20 Jul 2021 08:54:22 -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-21-N9ODFjFePw2-6bc37huCDA-1; Tue, 20 Jul 2021 08:54:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3ADA5800050 for ; Tue, 20 Jul 2021 12:54:16 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-187.ams2.redhat.com [10.36.114.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A82919C79; Tue, 20 Jul 2021 12:54:12 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 021ED112D848; Tue, 20 Jul 2021 14:54:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626785658; 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=tG45zN/Yo+X4/PVK2K1UnA3+Ntv2MO61J9bSokSZ6Cg=; b=KZTC662PlToayICyanovGyoJsgMO3LBm4tBeu9gIqCGCDxLsmpHGv7P8G4eaZWTEj7ReO0 ICvpTpHMQB2xG855rSnUfXrKmZ8PTXU6Cc9CLqycIzAyRTuXeQfrwFEFIKayzLY3ptWRwY c2V0VNInaPWVrPkL5AumDEcJr3yiyiA= X-MC-Unique: N9ODFjFePw2-6bc37huCDA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 05/16] vhost-scsi: Plug memory leak on migrate_add_blocker() failure Date: Tue, 20 Jul 2021 14:53:57 +0200 Message-Id: <20210720125408.387910-6-armbru@redhat.com> In-Reply-To: <20210720125408.387910-1-armbru@redhat.com> References: <20210720125408.387910-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.474, 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: "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626785914229100007 Content-Type: text/plain; charset="utf-8" Cc: Michael S. Tsirkin Signed-off-by: Markus Armbruster --- hw/scsi/vhost-scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 8c611bfd2d..039caf2614 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -208,7 +208,6 @@ static void vhost_scsi_realize(DeviceState *dev, Error = **errp) "target SCSI device state or use shared storage over netwo= rk), " "set 'migratable' property to true to enable migration."); if (migrate_add_blocker(vsc->migration_blocker, errp) < 0) { - error_free(vsc->migration_blocker); goto free_virtio; } } @@ -233,11 +232,12 @@ static void vhost_scsi_realize(DeviceState *dev, Erro= r **errp) return; =20 free_vqs: + g_free(vsc->dev.vqs); if (!vsc->migratable) { migrate_del_blocker(vsc->migration_blocker); } - g_free(vsc->dev.vqs); free_virtio: + error_free(vsc->migration_blocker); virtio_scsi_common_unrealize(dev); close_fd: close(vhostfd); --=20 2.31.1