aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/rocket.c
diff options
context:
space:
mode:
authorAnton Vasilyev <vasilyev@ispras.ru>2018-07-27 16:39:31 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-02 10:11:32 +0200
commit0419056ec8fd01ddf5460d2dba0491aad22657dd (patch)
treee97023b2397f8d7f3d7ed55a40fd0d8ec5c3039e /drivers/tty/rocket.c
parentserial: 8250_dw: Add ACPI support for uart on Broadcom SoC (diff)
downloadlinux-dev-0419056ec8fd01ddf5460d2dba0491aad22657dd.tar.xz
linux-dev-0419056ec8fd01ddf5460d2dba0491aad22657dd.zip
tty: rocket: Fix possible buffer overwrite on register_PCI
If number of isa and pci boards exceed NUM_BOARDS on the path rp_init()->init_PCI()->register_PCI() then buffer overwrite occurs in register_PCI() on assign rcktpt_io_addr[i]. The patch adds check on upper bound for index of registered board in register_PCI. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Anton Vasilyev <vasilyev@ispras.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/rocket.c')
-rw-r--r--drivers/tty/rocket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index bdd17d2aaafd..b121d8f8f3d7 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -1881,7 +1881,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
ByteIO_t UPCIRingInd = 0;
if (!dev || !pci_match_id(rocket_pci_ids, dev) ||
- pci_enable_device(dev))
+ pci_enable_device(dev) || i >= NUM_BOARDS)
return 0;
rcktpt_io_addr[i] = pci_resource_start(dev, 0);