From nobody Mon Feb 9 11:33:14 2026 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=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=1575457913; cv=none; d=zohomail.com; s=zohoarc; b=e656yJzSTrm6YLbgcqZr+yyw3XvOrk6+3OgkaVWfIO8m2Y1SsT3HjkHbTQQRZygO0KzOccDcFgdClcHo80+s/aNVlutJ5tFoIcSBrk5JwfSO7csphQ/wRtxbTPcmTA0Uh6bH6O63CeLfuSZLgtR7YT9vOtgUl5MqtwLtWxc+Eis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575457913; 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=ck8YC4RtctXQY4XvFDhEnQzwtpi+SeKk9po2VZb4n6E=; b=YWCOIEoXJ9DrzNXa3RzQji82hJ+qbTTH7l1/XlMSPP+qtjFwGtVKr+Pm7fE0Jz5LwUcS5NcgLvG9x4pWiJMDUG88tpYBv+kIhiMcM9ZX3aq12akikef9K6OzzRzj0IKXaRlzpOzUI9+dJuXO+jJWu3JUBnIhm77IZlj6TT80/WI= 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 1575457913903982.7732134968442; Wed, 4 Dec 2019 03:11:53 -0800 (PST) Received: from localhost ([::1]:36904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icSZR-0003sl-IH for importer@patchew.org; Wed, 04 Dec 2019 06:11:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39016) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icR5Z-0007G6-H2 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 04:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icR5H-0000Hv-Gm for qemu-devel@nongnu.org; Wed, 04 Dec 2019 04:36:46 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21013 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 1icR5G-0008SZ-BB for qemu-devel@nongnu.org; Wed, 04 Dec 2019 04:36:35 -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-286-eLUV5_UrMtuHeT-s4l1ing-1; Wed, 04 Dec 2019 04:36:29 -0500 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 A7BD418543A2 for ; Wed, 4 Dec 2019 09:36:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7294A19C68; Wed, 4 Dec 2019 09:36:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9243111366D5; Wed, 4 Dec 2019 10:36:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575452190; 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=ck8YC4RtctXQY4XvFDhEnQzwtpi+SeKk9po2VZb4n6E=; b=JMh31jnB4yrx8eUAhiDIdRLS3caH9BCaPxoYW1rRYu+RqA1Ye3aczEVJXUr+c2ath3IxAI lEEeNlers+xV95OvKD4VZPHvTZM7ADnnDm/x2ut7XiDsHOChKJND9zblLyWju1juCdCbcF dTq1zfg83eAkwgxWMjfCbIsMM/nkKEw= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 05/18] exec: Fix file_ram_alloc() error API violations Date: Wed, 4 Dec 2019 10:36:12 +0100 Message-Id: <20191204093625.14836-6-armbru@redhat.com> In-Reply-To: <20191204093625.14836-1-armbru@redhat.com> References: <20191204093625.14836-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: eLUV5_UrMtuHeT-s4l1ing-1 X-Mimecast-Spam-Score: 0 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: 205.139.110.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: Igor Mammedov 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" When os_mem_prealloc() fails, file_ram_alloc() calls qemu_ram_munmap() and returns null. Except it doesn't when its @errp argument is null, because it checks for failure with (errp && *errp). Introduced in commit 056b68af77 "fix qemu exit on memory hotplug when allocation fails at prealloc time". No caller actually passes null. Fix anyway: splice in a local Error *err, and error_propagate(). Cc: Igor Mammedov Signed-off-by: Markus Armbruster Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- exec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index ffdb518535..45695a5f2d 100644 --- a/exec.c +++ b/exec.c @@ -1841,6 +1841,7 @@ static void *file_ram_alloc(RAMBlock *block, bool truncate, Error **errp) { + Error *err =3D NULL; MachineState *ms =3D MACHINE(qdev_get_machine()); void *area; =20 @@ -1898,8 +1899,9 @@ static void *file_ram_alloc(RAMBlock *block, } =20 if (mem_prealloc) { - os_mem_prealloc(fd, area, memory, ms->smp.cpus, errp); - if (errp && *errp) { + os_mem_prealloc(fd, area, memory, ms->smp.cpus, &err); + if (err) { + error_propagate(errp, err); qemu_ram_munmap(fd, area, memory); return NULL; } --=20 2.21.0