From nobody Thu Nov 13 20:44:52 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582646237; cv=none; d=zohomail.com; s=zohoarc; b=GXmfeR54lSjLb2kPTMMsuyVuMwfYL2nePsgkGWkhpaGjE67RBGo03JkeI80Iyj14kJ5s+LN8M8/zgQp9J6pbVhA0qycj60vaFr6iE0dtwjM5A1sVaLXNvOnS4Go+2BJ/zNRwAbTKgIW3ivbgs1uYIcPteg6YcepGtq8hHGmO8kU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582646237; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Zkpd81UshpASrqvXsuZBzG/W8uDh2jjXtDL2Qc4HYxY=; b=BOQNj7LvX97jfWYNcIiXy4b/WHQRPvb1joxJfPD2XuafDIFdPdJSJsK/fe9BE68kx2WPngBu78LuOajO57kmE8PE7SrHaFfMdoPr1W5wSJWYtLeYKXNHkmWgjXkxp0fMunRCMP37/8bVQqAqO07tnKMHfWIPiKUVkD/4OjdFx2w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1582646237184250.92855364486036; Tue, 25 Feb 2020 07:57:17 -0800 (PST) Received: from localhost ([::1]:59444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6caA-00007W-2g for importer@patchew.org; Tue, 25 Feb 2020 10:57:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36378) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6cZP-0007K8-FD for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:56:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6cZO-0007vE-DE for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:56:27 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27392 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6cZO-0007uu-AF for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:56:26 -0500 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-53-NJUGdKVlPi62IxLe8R1sbQ-1; Tue, 25 Feb 2020 10:56:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 171778017CC; Tue, 25 Feb 2020 15:56:21 +0000 (UTC) Received: from localhost (ovpn-117-215.ams2.redhat.com [10.36.117.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 929245D9E5; Tue, 25 Feb 2020 15:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582646185; 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; bh=Zkpd81UshpASrqvXsuZBzG/W8uDh2jjXtDL2Qc4HYxY=; b=Ya1sO0XrdyCB1pvUr8wWkzxKhRFb14iq4BgoSTz7aOXmLSG44VP35D+bjoZ/1Hm9BJ+l29 +Rc20g7R1kLlOtUULt6K1dP8UpCPalXcSwMr2Lz2MsXds5UXe/JeO9b7OLpgyScLqtL/Cr KCha6iCXtdickJjFuqyaO9d0wIb3Ep4= X-MC-Unique: NJUGdKVlPi62IxLe8R1sbQ-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH] block: Fix leak in bdrv_create_file_fallback() Date: Tue, 25 Feb 2020 16:56:18 +0100 Message-Id: <20200225155618.133412-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" @options is leaked by the first two return statements in this function. Note that blk_new_open() takes the reference to @options even on failure, so all we need to do to fix the leak is to move the QDict allocation down to where we actually need it. Reported-by: Coverity (CID 1419884) Fixes: fd17146cd93d1704cd96d7c2757b325fc7aac6fd ("block: Generic file creation fallback") Signed-off-by: Max Reitz --- block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 1bdb9c679d..876bd45182 100644 --- a/block.c +++ b/block.c @@ -600,7 +600,7 @@ static int bdrv_create_file_fallback(const char *filena= me, BlockDriver *drv, QemuOpts *opts, Error **errp) { BlockBackend *blk; - QDict *options =3D qdict_new(); + QDict *options; int64_t size =3D 0; char *buf =3D NULL; PreallocMode prealloc; @@ -623,6 +623,7 @@ static int bdrv_create_file_fallback(const char *filena= me, BlockDriver *drv, return -ENOTSUP; } =20 + options =3D qdict_new(); qdict_put_str(options, "driver", drv->format_name); =20 blk =3D blk_new_open(filename, NULL, options, --=20 2.24.1