From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72727C7618B for ; Tue, 23 Jul 2019 16:09:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4854521734 for ; Tue, 23 Jul 2019 16:09:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4854521734 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpxLr-0008BR-Vd for qemu-devel@archiver.kernel.org; Tue, 23 Jul 2019 12:09:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56948) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpxLi-0007nC-P1 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 12:09:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpxLh-00065c-ST for qemu-devel@nongnu.org; Tue, 23 Jul 2019 12:09:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45021) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpxLh-00065J-Nb for qemu-devel@nongnu.org; Tue, 23 Jul 2019 12:09:09 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id CB50630BA078; Tue, 23 Jul 2019 16:09:08 +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 A572019D71; Tue, 23 Jul 2019 16:09:04 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 23 Jul 2019 12:08:59 -0400 Message-Id: <20190723160859.27250-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 23 Jul 2019 16:09:09 +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-dimm: fix crash when invalid slot number is used 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: david@gibson.dropbear.id.au, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" QEMU will crash with: Segmentation fault (core dumped) when negative slot number is used, ex: qemu-system-x86_64 -m 1G,maxmem=20G,slots=256 \ -object memory-backend-ram,id=mem1,size=1G \ -device pc-dimm,id=dimm1,memdev=mem1,slot=-2 fix it by checking that slot number is within valid range. Signed-off-by: Igor Mammedov --- hw/mem/pc-dimm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index b1239fd0d3..29c785799c 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -38,6 +38,13 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, slot = object_property_get_int(OBJECT(dimm), PC_DIMM_SLOT_PROP, &error_abort); + if ((slot < 0 || slot >= machine->ram_slots) && + slot != PC_DIMM_UNASSIGNED_SLOT) { + error_setg(&local_err, "invalid slot number, valid range is [0-%" + PRIu64 "]", machine->ram_slots - 1); + goto out; + } + slot = pc_dimm_get_free_slot(slot == PC_DIMM_UNASSIGNED_SLOT ? NULL : &slot, machine->ram_slots, &local_err); if (local_err) { -- 2.18.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79020C76186 for ; Mon, 29 Jul 2019 21:18:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4DDEB2073F for ; Mon, 29 Jul 2019 21:18:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DDEB2073F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsD1s-00084m-Km for qemu-devel@archiver.kernel.org; Mon, 29 Jul 2019 17:18:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56719) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsD0H-0005uD-Qq for qemu-devel@nongnu.org; Mon, 29 Jul 2019 17:16:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsD0G-0003jl-Mj for qemu-devel@nongnu.org; Mon, 29 Jul 2019 17:16:21 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:43668) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsD0G-0003jZ-JD for qemu-devel@nongnu.org; Mon, 29 Jul 2019 17:16:20 -0400 Received: by mail-qt1-f173.google.com with SMTP id w17so16623080qto.10 for ; Mon, 29 Jul 2019 14:16:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=qNyxluckYNXjX0PviQMIN4Hjjd/tW1RorHrzwXKNic0=; b=YXCabN4v+vFndbgr3CdIbguu2YmQ5vZkpdoxFr3rCZv5S6nRK7fZky6Cn8GU96lNOk khYBw42Akt4UYBWbAaPsMgtYj6qlq6NFhYbuJ8FqA5fuEQCnmgjrpuFC/Q8Qebn4T6Yy R/3eHnjXTkty5CDepES3agQW5zh82IEgcRedW88UPAfqgXaBuYknvE9kmkfFiVmexrzp wwdT1PiT72rqfrrlVbRSX9GiDxLvbiByzz2gfsInC3/NLhLRvX5l6K9AkjpjjEKuyRa5 Or/M23B3BILNC9sxrkJtD/xAx1yqqxrY+d+QadrTDowpEem99baO5WjeySa44yByAdYL 8afw== X-Gm-Message-State: APjAAAXp+4IcGu1VDxfOf8aqOa85+KxzXzliiitINXbaPPB3yYLLLvT2 Vlm+xEmRm9ZtvvogJ68O2JnkAoLx5IcGPA== X-Google-Smtp-Source: APXvYqwoU/egkdex8u6mxc9FsYJMsUwNUUJAJoao73k/ZNmzDvjN/rmkCY5pjfiiTN0jOI0myzeT/A== X-Received: by 2002:a0c:ad7a:: with SMTP id v55mr78346444qvc.130.1564434979765; Mon, 29 Jul 2019 14:16:19 -0700 (PDT) Received: from redhat.com (bzq-79-181-91-42.red.bezeqint.net. [79.181.91.42]) by smtp.gmail.com with ESMTPSA id g2sm27478762qkf.32.2019.07.29.14.16.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 14:16:19 -0700 (PDT) Date: Mon, 29 Jul 2019 17:16:14 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20190723160859.27250-1-imammedo@redhat.com> References: <20190729211404.1533-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190729211404.1533-1-mst@redhat.com> X-Mailer: git-send-email 2.22.0.678.g13338e74b8 X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.173 Subject: [Qemu-devel] [PULL 3/3] pc-dimm: fix crash when invalid slot number is used 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: Peter Maydell , Pankaj Gupta , Li Qiang , <@redhat.com, Mammedov@redhat.com, Igor Mammedov , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190729211614.e_nKAiNoJDhFUCrBz2F3QmB-D-U_dpE2MFddBp6-Tng@z> From: Igor Mammedov QEMU will crash with: Segmentation fault (core dumped) when negative slot number is used, ex: qemu-system-x86_64 -m 1G,maxmem=20G,slots=256 \ -object memory-backend-ram,id=mem1,size=1G \ -device pc-dimm,id=dimm1,memdev=mem1,slot=-2 fix it by checking that slot number is within valid range. Signed-off-by: Igor Mammedov Message-Id: <20190723160859.27250-1-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: David Gibson Reviewed-by: Li Qiang Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Reviewed-by: Li Qiang <liq3ea@gmail.com>
 
Reviewed-by: Pankaj Gupta --- hw/mem/pc-dimm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index b1239fd0d3..29c785799c 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -38,6 +38,13 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, slot = object_property_get_int(OBJECT(dimm), PC_DIMM_SLOT_PROP, &error_abort); + if ((slot < 0 || slot >= machine->ram_slots) && + slot != PC_DIMM_UNASSIGNED_SLOT) { + error_setg(&local_err, "invalid slot number, valid range is [0-%" + PRIu64 "]", machine->ram_slots - 1); + goto out; + } + slot = pc_dimm_get_free_slot(slot == PC_DIMM_UNASSIGNED_SLOT ? NULL : &slot, machine->ram_slots, &local_err); if (local_err) { -- MST