diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-11-09 07:24:55 -0500 |
---|---|---|
committer | Alex Williamson <alex.williamson@redhat.com> | 2015-11-09 10:59:11 -0500 |
commit | 222e684ca762e9288108fcf852eb5d08cbe10ae3 (patch) | |
tree | e73a067a3970c46aedc4c9a2ec6cca5635437ef7 /drivers/vfio | |
parent | 033291eccbdb1b70ffc02641edae19ac825dc75d (diff) |
vfio/pci: make an array larger
Smatch complains about a possible out of bounds error:
drivers/vfio/pci/vfio_pci_config.c:1241 vfio_cap_init()
error: buffer overflow 'pci_cap_length' 20 <= 20
The problem is that pci_cap_length[] was defined as large enough to
hold "PCI_CAP_ID_AF + 1" elements. The code in vfio_cap_init() assumes
it has PCI_CAP_ID_MAX + 1 elements. Originally, PCI_CAP_ID_AF and
PCI_CAP_ID_MAX were the same but then we introduced PCI_CAP_ID_EA in
commit f80b0ba95964 ("PCI: Add Enhanced Allocation register entries")
so now the array is too small.
Let's fix this by making the array size PCI_CAP_ID_MAX + 1. And let's
make a similar change to pci_ext_cap_length[] for consistency. Also
both these arrays can be made const.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
-rw-r--r-- | drivers/vfio/pci/vfio_pci_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c index a8657ef6382f..fe2b470d7ec6 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c | |||
@@ -46,7 +46,7 @@ | |||
46 | * 0: Removed from the user visible capability list | 46 | * 0: Removed from the user visible capability list |
47 | * FF: Variable length | 47 | * FF: Variable length |
48 | */ | 48 | */ |
49 | static u8 pci_cap_length[] = { | 49 | static const u8 pci_cap_length[PCI_CAP_ID_MAX + 1] = { |
50 | [PCI_CAP_ID_BASIC] = PCI_STD_HEADER_SIZEOF, /* pci config header */ | 50 | [PCI_CAP_ID_BASIC] = PCI_STD_HEADER_SIZEOF, /* pci config header */ |
51 | [PCI_CAP_ID_PM] = PCI_PM_SIZEOF, | 51 | [PCI_CAP_ID_PM] = PCI_PM_SIZEOF, |
52 | [PCI_CAP_ID_AGP] = PCI_AGP_SIZEOF, | 52 | [PCI_CAP_ID_AGP] = PCI_AGP_SIZEOF, |
@@ -74,7 +74,7 @@ static u8 pci_cap_length[] = { | |||
74 | * 0: Removed or masked from the user visible capabilty list | 74 | * 0: Removed or masked from the user visible capabilty list |
75 | * FF: Variable length | 75 | * FF: Variable length |
76 | */ | 76 | */ |
77 | static u16 pci_ext_cap_length[] = { | 77 | static const u16 pci_ext_cap_length[PCI_EXT_CAP_ID_MAX + 1] = { |
78 | [PCI_EXT_CAP_ID_ERR] = PCI_ERR_ROOT_COMMAND, | 78 | [PCI_EXT_CAP_ID_ERR] = PCI_ERR_ROOT_COMMAND, |
79 | [PCI_EXT_CAP_ID_VC] = 0xFF, | 79 | [PCI_EXT_CAP_ID_VC] = 0xFF, |
80 | [PCI_EXT_CAP_ID_DSN] = PCI_EXT_CAP_DSN_SIZEOF, | 80 | [PCI_EXT_CAP_ID_DSN] = PCI_EXT_CAP_DSN_SIZEOF, |