From nobody Wed Apr 24 22:25:26 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=1562916999; cv=none; d=zoho.com; s=zohoarc; b=Y/fvWasIl3ZgV4UIHXajfKyANyGgPuAptOuJCyqY583O2lCMjQKC7gfaFwrp1TVPYRh+sAT6Q6eJivS2/nvkgtOieOdZXX/vMLww0HbNB+fTUCrDOcAm8GlPYhDcvcvggzQvsCGp3AkrYTcFUQDbKgQPfAd7L/vMnm3vVHSbk54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562916999; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=wLdA7nfn3EJtQIXV4wYmPWB+ghR2RKsFRpo3gsb/Rt4=; b=ZnmhgXm4D5M5ysdTX7wVgoN6RaE9VjUGvmQpsdviIaTm0O6woM2IhoJDsgZw95OxYNMyTxgKodfFkAkFgZZOiyG2QFDVyjK16gc/LRBpDk+3A9oBRCQLU2xhXznPk5+j7Zt/V2B3FB5gIquWqCWqi2l+x4Desdlmv5kvrxRTi0k= 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 1562916999768839.2859976869736; Fri, 12 Jul 2019 00:36:39 -0700 (PDT) Received: from localhost ([::1]:47188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlq6g-0008IM-4Z for importer@patchew.org; Fri, 12 Jul 2019 03:36:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39045) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlq6O-0007Qe-RC for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlq6N-0000mb-Km for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36146) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlq6M-0000lJ-2o for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:18 -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 51877308338F; Fri, 12 Jul 2019 07:36:17 +0000 (UTC) Received: from dhcp201-121.englab.pnq.redhat.com (ovpn-116-201.sin2.redhat.com [10.67.116.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2CB060BF4; Fri, 12 Jul 2019 07:36:13 +0000 (UTC) From: Pankaj Gupta To: mst@redhat.com Date: Fri, 12 Jul 2019 13:05:52 +0530 Message-Id: <20190712073554.21918-2-pagupta@redhat.com> In-Reply-To: <20190712073554.21918-1-pagupta@redhat.com> References: <20190712073554.21918-1-pagupta@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.44]); Fri, 12 Jul 2019 07:36:17 +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 1/3] virtio pmem: fix wrong mem region condition 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: pagupta@redhat.com, peter.maydell@linaro.org, cohuck@redhat.com, qemu-devel@nongnu.org, david@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" Coverity reported memory region returns zero for non-null value. This is because of wrong arguments to '?:' , fixing this. Signed-off-by: Pankaj Gupta Reviewed-by: Cornelia Huck Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefano Garzarella Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/virtio-pmem-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/virtio-pmem-pci.c b/hw/virtio/virtio-pmem-pci.c index 8b2d0dbccc..0da6627469 100644 --- a/hw/virtio/virtio-pmem-pci.c +++ b/hw/virtio/virtio-pmem-pci.c @@ -57,7 +57,7 @@ static uint64_t virtio_pmem_pci_get_plugged_size(const Me= moryDeviceState *md, MemoryRegion *mr =3D vpc->get_memory_region(pmem, errp); =20 /* the plugged size corresponds to the region size */ - return mr ? 0 : memory_region_size(mr); + return mr ? memory_region_size(mr) : 0; } =20 static void virtio_pmem_pci_fill_device_info(const MemoryDeviceState *md, --=20 2.14.5 From nobody Wed Apr 24 22:25:26 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=1562917017; cv=none; d=zoho.com; s=zohoarc; b=BlyCkj2wOU7IAVu34406i7lQPQWgvdgT4MIypPGylgyuBkdPYqQwzo9nnb5iIaA1UIh7f5e4JYZrWqRTUP8r7tPBrAprnmC+H8CcMRENamzAn+LDCqYTnbbXhjhXj8KNG7GwscxoKRnTp9+eRoXXiip0pI3D5mWa8Z4D8pi+njk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562917017; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=BECZiBLi9izHZ8aS9ZojTcWDilr+frw+liNH+wm5sos=; b=Xl+gqB13ISf3xGdnPyXllN85CM0JuAcBzCZKpI3RFF1CEuRqk1GDChcizE5jl4TRf2hVH6SL40VBU4gbMCvOda7Bw8lENKwmvLarVe7cyCFcUmxiqA9wQ06aPA8Q9WKRbqT/gQyXsTWEtWfzLrQPogme5N2ZP1TAhqqISn/Bxxc= 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 1562917017771758.9627525880185; Fri, 12 Jul 2019 00:36:57 -0700 (PDT) Received: from localhost ([::1]:47200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlq6y-0001KC-Hi for importer@patchew.org; Fri, 12 Jul 2019 03:36:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39077) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlq6S-0007fT-N7 for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlq6R-0000ot-Ku for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40255) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlq6R-0000oK-FV for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:23 -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 50687C049589; Fri, 12 Jul 2019 07:36:21 +0000 (UTC) Received: from dhcp201-121.englab.pnq.redhat.com (ovpn-116-201.sin2.redhat.com [10.67.116.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 082F3608AB; Fri, 12 Jul 2019 07:36:17 +0000 (UTC) From: Pankaj Gupta To: mst@redhat.com Date: Fri, 12 Jul 2019 13:05:53 +0530 Message-Id: <20190712073554.21918-3-pagupta@redhat.com> In-Reply-To: <20190712073554.21918-1-pagupta@redhat.com> References: <20190712073554.21918-1-pagupta@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.31]); Fri, 12 Jul 2019 07:36:21 +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 2/3] virtio pmem: remove memdev null check 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: pagupta@redhat.com, peter.maydell@linaro.org, cohuck@redhat.com, qemu-devel@nongnu.org, david@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" Coverity reports that when we're assigning vi->size we handle the=20 "pmem->memdev is NULL" case; but we then pass it into=20 object_get_canonical_path(), which unconditionally dereferences it and will crash if it is NULL. If this pointer can be NULL then we need to do something else here. We are removing 'pmem->memdev' null check here as memdev will never be null in this function. Signed-off-by: Pankaj Gupta Reviewed-by: Cornelia Huck --- hw/virtio/virtio-pmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index adbfb603ab..17c196d107 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -134,8 +134,8 @@ static void virtio_pmem_fill_device_info(const VirtIOPM= EM *pmem, VirtioPMEMDeviceInfo *vi) { vi->memaddr =3D pmem->start; - vi->size =3D pmem->memdev ? memory_region_size(&pmem->memdev->mr) : 0; - vi->memdev =3D object_get_canonical_path(OBJECT(pmem->memdev)); + vi->size =3D memory_region_size(&pmem->memdev->mr); + vi->memdev =3D object_get_canonical_path(OBJECT(pmem->memdev)); } =20 static MemoryRegion *virtio_pmem_get_memory_region(VirtIOPMEM *pmem, --=20 2.14.5 From nobody Wed Apr 24 22:25:26 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=1562917021; cv=none; d=zoho.com; s=zohoarc; b=Cekvq6Bo2IXhPUL9v9QQvv95Ip0/VFDjpRFx0hzZ9aLCgyl8ZkaRp1q+GnwE+KneugEF8YjQv9BgAOd6Sn+fS4ewiM03zmap+piuf26+Rx/NaLJGAOebz9NCDKpBMX9ToQOaxkKLwUDDneUk8g+2Hdxi+uPgEremdv79v+oOIjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562917021; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=D90kF41WQxXAqI2PKlChOOp9RgIUUtoVdEwkigog7SM=; b=e4ZmpLFx3t4wg1+wQZmpeFzSZd7uuD7kxpuvRqLQQtKfzcdsurI5Ra5JIvQgBh/K1KAIyQZa2F/4u96z0+3uGZpVC18uMcZWXQzRsB6pgyFEDDWe60i1pRN+jMQMsoPnodlBYB39wHCdANnFwVHZKp1zmSSg/TGLYEcAd8FLC7M= 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 1562917021896617.6719415618617; Fri, 12 Jul 2019 00:37:01 -0700 (PDT) Received: from localhost ([::1]:47204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlq72-0001ap-Dk for importer@patchew.org; Fri, 12 Jul 2019 03:37:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39099) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlq6W-0007y4-IL for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlq6U-0000qE-GF for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33590) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlq6U-0000q1-9P for qemu-devel@nongnu.org; Fri, 12 Jul 2019 03:36:26 -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 9A6BC30001D7; Fri, 12 Jul 2019 07:36:25 +0000 (UTC) Received: from dhcp201-121.englab.pnq.redhat.com (ovpn-116-201.sin2.redhat.com [10.67.116.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1972D6062B; Fri, 12 Jul 2019 07:36:21 +0000 (UTC) From: Pankaj Gupta To: mst@redhat.com Date: Fri, 12 Jul 2019 13:05:54 +0530 Message-Id: <20190712073554.21918-4-pagupta@redhat.com> In-Reply-To: <20190712073554.21918-1-pagupta@redhat.com> References: <20190712073554.21918-1-pagupta@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.42]); Fri, 12 Jul 2019 07:36:25 +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 3/3] virtio pmem: remove transational device info 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: pagupta@redhat.com, peter.maydell@linaro.org, cohuck@redhat.com, qemu-devel@nongnu.org, david@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" Remove transactional & non transactional device info for virtio pmem.=20 Signed-off-by: Pankaj Gupta Reviewed-by: Cornelia Huck Reviewed-by: David Hildenbrand --- hw/virtio/virtio-pmem-pci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/virtio/virtio-pmem-pci.c b/hw/virtio/virtio-pmem-pci.c index 0da6627469..fe2af00fa1 100644 --- a/hw/virtio/virtio-pmem-pci.c +++ b/hw/virtio/virtio-pmem-pci.c @@ -113,8 +113,6 @@ static void virtio_pmem_pci_instance_init(Object *obj) static const VirtioPCIDeviceTypeInfo virtio_pmem_pci_info =3D { .base_name =3D TYPE_VIRTIO_PMEM_PCI, .generic_name =3D "virtio-pmem-pci", - .transitional_name =3D "virtio-pmem-pci-transitional", - .non_transitional_name =3D "virtio-pmem-pci-non-transitional", .instance_size =3D sizeof(VirtIOPMEMPCI), .instance_init =3D virtio_pmem_pci_instance_init, .class_init =3D virtio_pmem_pci_class_init, --=20 2.14.5