diff options
author | Sebastian Ott <sebott@linux.ibm.com> | 2018-08-13 11:26:46 +0200 |
---|---|---|
committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2018-08-16 14:49:12 +0200 |
commit | 866f3576a72b2233a76dffb80290f8086dc49e17 (patch) | |
tree | a20cbde9b2a668998578cf23f145f489e99e5fca | |
parent | 2395103b3fbf2553d94a64ac3e29595cb040474b (diff) | |
download | linux-stable-866f3576a72b2233a76dffb80290f8086dc49e17.tar.gz linux-stable-866f3576a72b2233a76dffb80290f8086dc49e17.tar.bz2 linux-stable-866f3576a72b2233a76dffb80290f8086dc49e17.zip |
s390/pci: fix out of bounds access during irq setup
During interrupt setup we allocate interrupt vectors, walk the list of msi
descriptors, and fill in the message data. Requesting more interrupts than
supported on s390 can lead to an out of bounds access.
When we restrict the number of interrupts we should also stop walking the
msi list after all supported interrupts are handled.
Cc: stable@vger.kernel.org
Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-rw-r--r-- | arch/s390/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 4902fed221c0..8a505cfdd9b9 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -421,6 +421,8 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) hwirq = 0; for_each_pci_msi_entry(msi, pdev) { rc = -EIO; + if (hwirq >= msi_vecs) + break; irq = irq_alloc_desc(0); /* Alloc irq on node 0 */ if (irq < 0) return -ENOMEM; |