]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
scsi: mpt3sas: fix an out of bound write
authorTomas Henzl <thenzl@redhat.com>
Fri, 19 Jan 2018 15:22:05 +0000 (16:22 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 31 Jan 2018 02:10:44 +0000 (21:10 -0500)
cpu_msix_table is allocated to store online cpus, but pci_irq_get_affinity
may return cpu_possible_mask which is then used to access cpu_msix_table.
That causes bad user experience.  Fix limits access to only online cpus,
I've also added an additional test to protect from an unlikely change in
cpu_online_mask.

[mkp: checkpatch]

Fixes: 1d55abc0e98a ("scsi: mpt3sas: switch to pci_alloc_irq_vectors")
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Acked-by: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/mpt3sas/mpt3sas_base.c

index 13d6e4ec3022cc6c38e5b36496556f5bad998afa..59a87ca328d36d39d2d95a1e6bd39e25573065a9 100644 (file)
@@ -2410,8 +2410,11 @@ _base_assign_reply_queues(struct MPT3SAS_ADAPTER *ioc)
                                continue;
                        }
 
-                       for_each_cpu(cpu, mask)
+                       for_each_cpu_and(cpu, mask, cpu_online_mask) {
+                               if (cpu >= ioc->cpu_msix_table_sz)
+                                       break;
                                ioc->cpu_msix_table[cpu] = reply_q->msix_index;
+                       }
                }
                return;
        }