From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=59839 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OniY2-00031a-F0 for qemu-devel@nongnu.org; Mon, 23 Aug 2010 21:43:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OniY1-0006LA-2q for qemu-devel@nongnu.org; Mon, 23 Aug 2010 21:43:34 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:41851) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OniY0-0006L6-Tt for qemu-devel@nongnu.org; Mon, 23 Aug 2010 21:43:33 -0400 Received: by qwh5 with SMTP id 5so5797224qwh.4 for ; Mon, 23 Aug 2010 18:43:32 -0700 (PDT) Date: Tue, 24 Aug 2010 09:43:25 +0800 From: Ken CC Subject: Re: [Qemu-devel] [PATCH 2/2] pci init: Check if devfn exceeding the max devices number supported on bus Message-ID: <20100824014325.GA6033@kt> References: <20100823053342.2537.19008.stgit@k1> <20100823053350.2560.472.stgit@k1> <20100823095656.GG20428@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100823095656.GG20428@valinux.co.jp> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: mtosatti@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org On Mon, Aug 23, 2010 at 06:56:56PM +0900, Isaku Yamahata wrote: > > How did you trigger the bug? > I suppose parse_pci_devfn() in qdev-properties should check the error. > Although I'm not objecting this patch itself, it's caller's bug. > Just assert(devfn < PCIBUS_MAX_DEVICES)? > assign pci addr > 30, e.g. qemu-system-x86_64 -drive \ file='./fedora.13-x86_64-virtio.qcow2',if=none,id=drv-virtio-d1,media=disk,cache=none,boot=on,format=qcow2 \ -device virtio-blk-pci,bus=pci.0,addr=0x90,drive=drv-virtio-d1,id=virtio-disk1 \ ^^^^ -m 2048 -vnc :11 assert() is good to me. and i think checking in the caller should be done too. > On Mon, Aug 23, 2010 at 01:56:31PM +0800, Ken CC wrote: > > > > Check before trying subindexing. > > > > Signed-off-by: Ken CC > > --- > > hw/pci.c | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > > > diff --git a/hw/pci.c b/hw/pci.c > > index a09fbac..f6f00c6 100644 > > --- a/hw/pci.c > > +++ b/hw/pci.c > > @@ -675,6 +675,10 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, > > error_report("PCI: no slot/function available for %s, all in use", name); > > return NULL; > > found: ; > > + } else if (devfn > PCIBUS_MAX_DEVICES - 1) { > > + error_report("PCI: devfn is out of bus capacity." > > + " Only %d devices supported.", PCIBUS_MAX_DEVICES); > > + return NULL; > > } else if (bus->devices[devfn]) { > > error_report("PCI: slot %d function %d not available for %s, in use by %s", > > PCI_SLOT(devfn), PCI_FUNC(devfn), name, bus->devices[devfn]->name); > > > > > > > > -- > yamahata --