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=-8.2 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_SANE_2 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 80E6DC2D0DB for ; Wed, 29 Jan 2020 18:17:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C2C1206D4 for ; Wed, 29 Jan 2020 18:17:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727450AbgA2SRM (ORCPT ); Wed, 29 Jan 2020 13:17:12 -0500 Received: from foss.arm.com ([217.140.110.172]:44538 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727385AbgA2SRM (ORCPT ); Wed, 29 Jan 2020 13:17:12 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 12E30328; Wed, 29 Jan 2020 10:17:12 -0800 (PST) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0783F3F67D; Wed, 29 Jan 2020 10:17:10 -0800 (PST) Date: Wed, 29 Jan 2020 18:17:08 +0000 From: Andre Przywara To: Alexandru Elisei Cc: kvm@vger.kernel.org, will@kernel.org, julien.thierry.kdev@gmail.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com, maz@kernel.org Subject: Re: [PATCH v2 kvmtool 14/30] vfio/pci: Don't access potentially unallocated regions Message-ID: <20200129181708.0c360d71@donnerap.cambridge.arm.com> In-Reply-To: <20200123134805.1993-15-alexandru.elisei@arm.com> References: <20200123134805.1993-1-alexandru.elisei@arm.com> <20200123134805.1993-15-alexandru.elisei@arm.com> Organization: ARM X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, 23 Jan 2020 13:47:49 +0000 Alexandru Elisei wrote: Hi, > Don't try to configure a BAR if there is no region associated with it. > > Signed-off-by: Alexandru Elisei > --- > vfio/pci.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/vfio/pci.c b/vfio/pci.c > index 1f38f90c3ae9..f86a7d9b7032 100644 > --- a/vfio/pci.c > +++ b/vfio/pci.c > @@ -652,6 +652,8 @@ static int vfio_pci_fixup_cfg_space(struct vfio_device *vdev) > > /* Initialise the BARs */ > for (i = VFIO_PCI_BAR0_REGION_INDEX; i <= VFIO_PCI_BAR5_REGION_INDEX; ++i) { > + if ((u32)i == vdev->info.num_regions) > + break; My inner check-patch complains that we should not have code before declarations. Can we solve this the same way as below? Cheers, Andre > u64 base; > struct vfio_region *region = &vdev->regions[i]; > > @@ -853,11 +855,12 @@ static int vfio_pci_configure_bar(struct kvm *kvm, struct vfio_device *vdev, > u32 bar; > size_t map_size; > struct vfio_pci_device *pdev = &vdev->pci; > - struct vfio_region *region = &vdev->regions[nr]; > + struct vfio_region *region; > > if (nr >= vdev->info.num_regions) > return 0; > > + region = &vdev->regions[nr]; > bar = pdev->hdr.bar[nr]; > > region->vdev = vdev;