[SCSI] mpt2sas: Fix possible integer truncation of cpu_count
authorRoland Dreier <roland@purestorage.com>
Thu, 1 Dec 2011 00:30:33 +0000 (16:30 -0800)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 15 Dec 2011 06:57:40 +0000 (10:57 +0400)
When computing reply_queue_count (the number of MSI-X vectors to use),
the driver does

ioc->reply_queue_count = min_t(u8, ioc->cpu_count,
    ioc->msix_vector_count);

However, on a big machine, ioc->cpu_count could be outside the range
that fits in a u8; eg a system with 256 CPUs will end up
reply_queue_count set to 0.

Fix this by calculating the minimum as ints and then letting the
assignment to reply_queue_count handle integer demotion.

Signed-off-by: Roland Dreier <roland@purestorage.com>
Acked-by: "Nandigama, Nagalakshmi" <Nagalakshmi.Nandigama@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/mpt2sas/mpt2sas_base.c

index 65c377dc027955684baa355bdee21c91d8524e9d..2da49cdf0208b5f91f25af38a60bb276a0e80d40 100644 (file)
@@ -1407,7 +1407,7 @@ _base_enable_msix(struct MPT2SAS_ADAPTER *ioc)
        if (_base_check_enable_msix(ioc) != 0)
                goto try_ioapic;
 
-       ioc->reply_queue_count = min_t(u8, ioc->cpu_count,
+       ioc->reply_queue_count = min_t(int, ioc->cpu_count,
            ioc->msix_vector_count);
 
        entries = kcalloc(ioc->reply_queue_count, sizeof(struct msix_entry),
This page took 0.03003 seconds and 5 git commands to generate.