From nobody Mon Feb 9 15:10:21 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=1576657158; cv=none; d=zohomail.com; s=zohoarc; b=RBxuhU5scKPSd6CZnuit1hSYWCMrUqdG2hfb3RR7zCjvUEvg5pPuMbpsVvM/P3AcMLPD2VUj2UxkM714MzbBWtvJdhyw3WDyCjkgIX6VPksGJ+RPoUobo55N+7FCCw5UYPD+ePoJ6D5sFfsIoCsM1mget0vD3ZSPNa9xVZow4kk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657158; 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=6HKGEEN/2k71Y/eOrbi6sjc52VczmaHxNAwUf3PdFXI=; b=KrIsc1HCrEOicbFu01dgr05dVv+PPV114omcVgqe6d7Qq1SjtTE7t1D0HncdJZ8g0Pg2UB79umLg78BRnGaJvbqrGYJ33TSK4glNKJbDrLq5B2m7l9+xfky3YUhQ4tl9eBBIo6k90qkmwdBiTMcfO4LKSnL6DU9uBoTRiE5ElLk= 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 157665715813167.8230943387124; Wed, 18 Dec 2019 00:19:18 -0800 (PST) Received: from localhost ([::1]:50916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUY8-0007vU-KW for importer@patchew.org; Wed, 18 Dec 2019 03:19:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35475) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWR-0005wh-Gw for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWP-0002R2-Mf for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54678 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 1ihUWP-0002Pn-F0 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -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-272-iXIBjZg1PW2iasf4z4LzaQ-1; Wed, 18 Dec 2019 03:17:27 -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 DA2D81854330 for ; Wed, 18 Dec 2019 08:17:26 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FBD726DC7; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 65A4211385CB; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657049; 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=6HKGEEN/2k71Y/eOrbi6sjc52VczmaHxNAwUf3PdFXI=; b=Q5oIfKLhD1hzNzCQuAwD6eyHI+s6UdR6yGag9Q7aE0xghuSmHKDEcPIi6dYX32IFHqCfXy BvMS8EOfdLsfX8f6hiza2CiZ/Hj1C7y1q3enLNbmwUIy5Vt6TVDwV2JiINxN/NTgsGZOkE OH1IZhlKCZdRJXkeZVuf2oLfK0IvkSE= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 06/35] exec: Fix file_ram_alloc() error API violations Date: Wed, 18 Dec 2019 09:16:52 +0100 Message-Id: <20191218081721.23520-7-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: iXIBjZg1PW2iasf4z4LzaQ-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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Message-Id: <20191204093625.14836-6-armbru@redhat.com> 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 a34c348184..6bd4aa1d87 100644 --- a/exec.c +++ b/exec.c @@ -1843,6 +1843,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 @@ -1900,8 +1901,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