From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52596 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OntXa-0007Si-R6 for qemu-devel@nongnu.org; Tue, 24 Aug 2010 09:27:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OntXW-0000nV-Kq for qemu-devel@nongnu.org; Tue, 24 Aug 2010 09:27:50 -0400 Received: from mail-qy0-f173.google.com ([209.85.216.173]:55771) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OntXW-0000nN-Gp for qemu-devel@nongnu.org; Tue, 24 Aug 2010 09:27:46 -0400 Received: by qyk5 with SMTP id 5so3906448qyk.4 for ; Tue, 24 Aug 2010 06:27:46 -0700 (PDT) Date: Tue, 24 Aug 2010 21:27:41 +0800 From: Ken CC Message-ID: <20100824132741.GC19469@kt> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100824132525.GA19469@kt> Subject: [Qemu-devel] [PATCH 3/4] Check pci slot number against PCIBUS_MAX_DEVICES in parse_pci_devfn List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yamahata@valinux.co.jp, avi@redhat.com, kvm@vger.kernel.org Cc: qemu-devel@nongnu.org, mst@redhat.com If pci addr provided from command line is bigger than 32, PCIBUS_MAX_DEVICES, return error -EINVAL. 32 << 3 | 7 == 256 (PCIBUS_MAX_FUNCTIONS) PCIBUS_MAX_FUNCTIONS = PCIBUS_MAX_DEVICES * PCI_FUNCTIONS_PER_DEVICE Signed-off-by: Ken CC --- hw/qdev-properties.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 9219cd7..565fd08 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -1,5 +1,5 @@ #include "net.h" -#include "qdev.h" +#include "pci.h" #include "qerror.h" void *qdev_get_prop_ptr(DeviceState *dev, Property *prop) @@ -514,6 +514,8 @@ static int parse_pci_devfn(DeviceState *dev, Property *prop, const char *str) return -EINVAL; } } + if (slot >= PCIBUS_MAX_DEVICES) + return -EINVAL; if (str[n] != '\0') return -EINVAL; if (fn > 7)