From nobody Wed May 15 06:12:45 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=1561366990; cv=none; d=zoho.com; s=zohoarc; b=SEcsggMH37JH12iSNxEMRIrz/tVpSerW9T7POPPLT/mWYW0Zg27L7D3/JBIjpoEcpbcrdYEYdthkTMMbSo0SL2UgdLjT+70ApuH8SoaJYd2KOQwFI3/B2g20PwfDcScvCIQ3uRPTq5TMKG0qN4cTQfevRvPGpRvPH2SyJmA2DhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561366990; 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=np04Aa+PRrI0ADktBdm1q5dY7D59hIHihWTz2Pa/QWg=; b=guJ1CZJKbeAWFPw/XLlFbmcRvjF18iZjHuINY79pgblvg+FG7yE6V9k1pw+TED5dOSVTYOzg1jnzjGynOFfm69q6HIjVbYpza1Jt1X7QzCaayfhU+rQPzdYScZlOX21jHn4VHphj1sfRF9zxix3pgjVuNiFLWyGh7ZUn90RVcco= 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 1561366990184357.92266404191673; Mon, 24 Jun 2019 02:03:10 -0700 (PDT) Received: from localhost ([::1]:48909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfKsU-0004oL-5S for importer@patchew.org; Mon, 24 Jun 2019 05:03:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48632) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfKri-0003ut-2D for qemu-devel@nongnu.org; Mon, 24 Jun 2019 05:02:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfKrh-0002SH-1S for qemu-devel@nongnu.org; Mon, 24 Jun 2019 05:02:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39782) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfKrg-00023a-Pg for qemu-devel@nongnu.org; Mon, 24 Jun 2019 05:02:16 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 00D1C308FEE2; Mon, 24 Jun 2019 09:02:07 +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 132B85D9CC; Mon, 24 Jun 2019 09:02:02 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 24 Jun 2019 05:02:00 -0400 Message-Id: <20190624090200.5383-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 24 Jun 2019 09:02:12 +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 v2] 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, rth@twiddle.net, ehabkost@redhat.com, armbru@redhat.com, mst@redhat.com 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2: * fix missing return value assignment (Eduardo Habkost ) --- 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 e96360b47a..552f3401e2 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2458,7 +2458,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) { + value =3D memory_region_size(&ms->device_memory->mr); + } =20 visit_type_int(v, name, &value, errp); } --=20 2.18.1