diff options
author | Mark Brown <broonie@kernel.org> | 2018-05-18 11:44:19 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-05-18 11:44:19 +0100 |
commit | 0e7fcfff8dc3b5f08f0bee84ce00d3234992e0d2 (patch) | |
tree | 26197742be1599e1fb8aa38cde3f0a2e7526d20d /arch/parisc | |
parent | 2da9deac1e123ce8f9c22919f9f49b3a50d0c3fd (diff) | |
parent | 69847b97f21141c2d4f6e9c1b22d932b7add3182 (diff) |
Merge tag 'v4.4.132' into linux-linaro-lsk-v4.4
This is the 4.4.132 stable release
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/kernel/drivers.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index dba508fe1683..4f7060ec6875 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c @@ -648,6 +648,10 @@ static int match_pci_device(struct device *dev, int index, (modpath->mod == PCI_FUNC(devfn))); } + /* index might be out of bounds for bc[] */ + if (index >= 6) + return 0; + id = PCI_SLOT(pdev->devfn) | (PCI_FUNC(pdev->devfn) << 5); return (modpath->bc[index] == id); } |