Changeset 62389 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Jul 21, 2016 8:54:53 AM (8 years ago)

Author:

vboxsync

Message:

PCI: fix limit check for 64-bit BAR index

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -3 +3 @@
  * DevPCI - ICH9 southbridge PCI bus emulation device.
  *
- * @note    bird: I've cleaned up DevPCI.cpp to some extend, this file has not
+ * @note    bird: I've cleaned up DevPCI.cpp to some extent, this file has not
  *                be cleaned up and because of pending code merge.
  */
 
 /*
- * Copyright (C) 2010-2015 Oracle Corporation
+ * Copyright (C) 2010-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1048 +1048 @@
     if ((enmType & PCI_ADDRESS_SPACE_BAR64) != 0)
     {
-        AssertMsgReturn(iRegion  < 4,
+        /* VBOX_PCI_BASE_ADDRESS_5 and VBOX_PCI_ROM_ADDRESS are excluded. */
+        AssertMsgReturn(iRegion < (PCI_NUM_REGIONS-2),
                         ("Region %d cannot be 64-bit\n", iRegion),
                         VERR_INVALID_PARAMETER);