From nobody Mon Feb 9 11:32:34 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=1575144068; cv=none; d=zohomail.com; s=zohoarc; b=j1lB3d6Mc5tjGZ5kOaghJT4nB7hC3zgKlaxGvBVG4YpQBF+uunGqO5RdLgVh1T51AencxJZn1Y1Fp52hl9BkRRLqFpARbpFolarfxfSEptQO/4Z7hB3wyakaoUyOozGBG8PBoFRmYuvx18r4dsBklB8WTDaBYYvTCAdE3+XQuYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575144068; 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=+dynwsHSBPSdNaS6/Bm4It61bKF8kebpsa7wwuPEPdY=; b=kCSiPwy0BchwUSbqH+jTCw9p7HoL/LpIZ8DeGcnFLli4M3DA1BkzEIYjM/Vv/SpV991CxtJRiaFXWNjEnDSbRwuPTFDOBaYXKSv1MgdGJq03M5hx65u75nI57ILnXZ/gRxCiiNvnVf5v89vzemSjw87HadlRX+R9HTr2dwTaBFY= 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 1575144068140330.0318475889799; Sat, 30 Nov 2019 12:01:08 -0800 (PST) Received: from localhost ([::1]:37842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ib8vS-0002U3-Pv for importer@patchew.org; Sat, 30 Nov 2019 15:01:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53640) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ib8dw-0006YM-V0 for qemu-devel@nongnu.org; Sat, 30 Nov 2019 14:43:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ib8dv-0005DV-2z for qemu-devel@nongnu.org; Sat, 30 Nov 2019 14:43:00 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:22916 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ib8du-0005Ac-PG for qemu-devel@nongnu.org; Sat, 30 Nov 2019 14:42:58 -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-212-NR7JGCSbN-OY7UmhITJ3Hw-1; Sat, 30 Nov 2019 14:42:52 -0500 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 D2043800D41; Sat, 30 Nov 2019 19:42:51 +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 01AE05D70E; Sat, 30 Nov 2019 19:42:49 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 303D911366F7; Sat, 30 Nov 2019 20:42:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575142976; 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=+dynwsHSBPSdNaS6/Bm4It61bKF8kebpsa7wwuPEPdY=; b=fcTNGbe8DiozWQqV2fdR44aFfZcYzJn7M0ByUh9kw1YuCOu5y+NtU9FNotGOPPeHj+kOWG ghG+6gvPmosxmlSFWDtsw8O3r9y9ZHIakObF4vweY07xAETa6GGAt1bV1DyKQYoy8OrT0z zNTpFEnzhzJ06wrlczTkmn0LU6Ev4EQ= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 13/21] memory-device: Fix latent memory pre-plug error handling bugs Date: Sat, 30 Nov 2019 20:42:32 +0100 Message-Id: <20191130194240.10517-14-armbru@redhat.com> In-Reply-To: <20191130194240.10517-1-armbru@redhat.com> References: <20191130194240.10517-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: NR7JGCSbN-OY7UmhITJ3Hw-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.61 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: vsementsov@virtuozzo.com, David Hildenbrand 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" memory_device_get_free_addr() crashes when memory_device_check_addable() fails and its @errp argument is null. Messed up in commit 1b6d6af21b "pc-dimm: factor out capacity and slot checks into MemoryDevice". The bug can't bite as no caller actually passes null. Fix it anyway. Cc: David Hildenbrand Signed-off-by: Markus Armbruster Reviewed-by: David Hildenbrand --- hw/mem/memory-device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index aef148c1d7..4bc9cf0917 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -99,6 +99,7 @@ static uint64_t memory_device_get_free_addr(MachineState = *ms, uint64_t align, uint64_t size, Error **errp) { + Error *err =3D NULL; GSList *list =3D NULL, *item; Range as, new =3D range_empty; =20 @@ -123,8 +124,9 @@ static uint64_t memory_device_get_free_addr(MachineStat= e *ms, return 0; } =20 - memory_device_check_addable(ms, size, errp); - if (*errp) { + memory_device_check_addable(ms, size, &err); + if (err) { + error_propagate(errp, err); return 0; } =20 --=20 2.21.0