Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI/MSI: Don't apply affinity if there aren't enough vectors left

Bart reported a problem wіth an out of bounds access in the low-level IRQ
affinity code, which we root caused to the qla2xxx driver assigning all its
MSI-X vectors to the pre and post vectors, and not having any left for the
actually spread IRQs.

Fix this issue by not asking for affinity assignment when there are no
vectors to assign left.

Fixes: 402723ad5c62 ("PCI/MSI: Provide pci_alloc_irq_vectors_affinity()")
Link: https://lkml.kernel.org/r/1485359225.3093.3.camel@sandisk.com
Reported-by: Bart Van Assche <bart.vanassche@sandisk.com>
Tested-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

authored by

Christoph Hellwig and committed by
Bjorn Helgaas
dfef358b 030305d6

+10
+10
drivers/pci/msi.c
··· 1206 1206 if (flags & PCI_IRQ_AFFINITY) { 1207 1207 if (!affd) 1208 1208 affd = &msi_default_affd; 1209 + 1210 + if (affd->pre_vectors + affd->post_vectors > min_vecs) 1211 + return -EINVAL; 1212 + 1213 + /* 1214 + * If there aren't any vectors left after applying the pre/post 1215 + * vectors don't bother with assigning affinity. 1216 + */ 1217 + if (affd->pre_vectors + affd->post_vectors == min_vecs) 1218 + affd = NULL; 1209 1219 } else { 1210 1220 if (WARN_ON(affd)) 1211 1221 affd = NULL;