Commit 58d813af authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller

net: aquantia: fix unsigned numvecs comparison with less than zero

From: Colin Ian King <colin.king@canonical.com>

This was originally mistakenly submitted to net-next. Resubmitting to net.

The comparison of numvecs < 0 is always false because numvecs is a u32
and hence the error return from a failed call to pci_alloc_irq_vectores
is never detected.  Fix this by using the signed int ret to handle the
error return and assign numvecs to err.

Detected by CoverityScan, CID#1468650 ("Unsigned compared against 0")

Fixes: a09bd81b ("net: aquantia: Limit number of vectors to actually allocated irqs")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bde49753
...@@ -267,14 +267,13 @@ static int aq_pci_probe(struct pci_dev *pdev, ...@@ -267,14 +267,13 @@ static int aq_pci_probe(struct pci_dev *pdev,
numvecs = min(numvecs, num_online_cpus()); numvecs = min(numvecs, num_online_cpus());
/*enable interrupts */ /*enable interrupts */
#if !AQ_CFG_FORCE_LEGACY_INT #if !AQ_CFG_FORCE_LEGACY_INT
numvecs = pci_alloc_irq_vectors(self->pdev, 1, numvecs, err = pci_alloc_irq_vectors(self->pdev, 1, numvecs,
PCI_IRQ_MSIX | PCI_IRQ_MSI | PCI_IRQ_MSIX | PCI_IRQ_MSI |
PCI_IRQ_LEGACY); PCI_IRQ_LEGACY);
if (numvecs < 0) { if (err < 0)
err = numvecs;
goto err_hwinit; goto err_hwinit;
} numvecs = err;
#endif #endif
self->irqvecs = numvecs; self->irqvecs = numvecs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment