From nobody Mon May 20 18:24:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1560174908; cv=none; d=zoho.com; s=zohoarc; b=LSIlBnguwuhAjo5U+K/J2eiR83rAzerhZU3LS9c37XQkGi3FbNST5y8EvrK8PE3EwP61Cdl/Rd5EjwtncWsxSmqVC7zJErHzjomLUlr8ZLpvh3O/sXfz88elPiRx3tBAtL2O1kcp8bBiBnB/3kl+sIwcf21gVa4UrQuT5/uaYtA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560174908; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=yj/N4P2Sj4Rds+LtNFCfGrCH/iHucH2DrxGuPvGISfk=; b=T9ogFgIfvWLlwZSUHnBdIzOBw0ZPshC2xKehV+4lbtazuQPPHo+kUVV2gA3wg8O5ji3iwQLGJS3pTZLdmRIlxa0PPyTTnx0kjEfL8w9SafIDueTozXijRu6TgNCg1+KQ26ONSBGp01Z2IC7wF6lDiLTEZQEA3vqPr77wS2NiCys= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 156017490834077.24720896876215; Mon, 10 Jun 2019 06:55:08 -0700 (PDT) Received: from localhost ([::1]:46744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haKlK-0005xi-A3 for importer@patchew.org; Mon, 10 Jun 2019 09:55:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51164) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haKgc-0008Qy-77 for qemu-devel@nongnu.org; Mon, 10 Jun 2019 09:50:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haKgb-0001jA-3H for qemu-devel@nongnu.org; Mon, 10 Jun 2019 09:50:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54550) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1haKga-0001gv-Tk for qemu-devel@nongnu.org; Mon, 10 Jun 2019 09:50:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 27D1181106; Mon, 10 Jun 2019 13:50:01 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D08E608C6; Mon, 10 Jun 2019 13:49:53 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 10 Jun 2019 15:50:35 +0200 Message-Id: <1560174635-22602-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 10 Jun 2019 13:50:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size() 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: pbonzini@redhat.com, mst@redhat.com, ehabkost@redhat.com, armbru@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" QEMU will crash when device-memory-region-size property is read if ms->devi= ce_memory wasn't initialized yet. Crash can be reproduced with: $QEMU -preconfig -qmp unix:qmp_socket,server,nowait & ./scripts/qmp/qom-get -s qmp_socket /machine.device-memory-region-size Instead of crashing return 0 if ms->device_memory hasn't been initialized. Signed-off-by: Igor Mammedov --- v2: add reproducer to commit message (Markus Armbruster ) hw/i386/pc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index edc240b..1b7ead9 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2459,7 +2459,11 @@ pc_machine_get_device_memory_region_size(Object *obj= , Visitor *v, Error **errp) { MachineState *ms =3D MACHINE(obj); - int64_t value =3D memory_region_size(&ms->device_memory->mr); + int64_t value =3D 0; + + if (ms->device_memory) { + memory_region_size(&ms->device_memory->mr); + } =20 visit_type_int(v, name, &value, errp); } --=20 2.7.4