Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c

+5 −6
Original line number Diff line number Diff line
@@ -267,14 +267,13 @@ static int aq_pci_probe(struct pci_dev *pdev, 
	numvecs = min(numvecs, num_online_cpus());

	/*enable interrupts */

#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_LEGACY);



	if (numvecs < 0) {

		err = numvecs;

	if (err < 0)

		goto err_hwinit;

	}

	numvecs = err;

#endif

	self->irqvecs = numvecs;