]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ice: Fix signedness bug in ice_init_interrupt_scheme()
authorDan Carpenter <dan.carpenter@linaro.org>
Thu, 13 Feb 2025 06:31:41 +0000 (09:31 +0300)
committerJakub Kicinski <kuba@kernel.org>
Sat, 15 Feb 2025 01:18:00 +0000 (17:18 -0800)
If pci_alloc_irq_vectors() can't allocate the minimum number of vectors
then it returns -ENOSPC so there is no need to check for that in the
caller.  In fact, because pf->msix.min is an unsigned int, it means that
any negative error codes are type promoted to high positive values and
treated as success.  So here, the "return -ENOMEM;" is unreachable code.
Check for negatives instead.

Now that we're only dealing with error codes, it's easier to propagate
the error code from pci_alloc_irq_vectors() instead of hardcoding
-ENOMEM.

Fixes: 79d97b8cf9a8 ("ice: remove splitting MSI-X between features")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Link: https://patch.msgid.link/b16e4f01-4c85-46e2-b602-fce529293559@stanley.mountain
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/intel/ice/ice_irq.c

index cbae3d81f0f1d6af6d6a3e526935ed2c7504d20b..30801fd375f0194df7c5434cce95e5f600e3a5a3 100644 (file)
@@ -149,8 +149,8 @@ int ice_init_interrupt_scheme(struct ice_pf *pf)
 
        vectors = pci_alloc_irq_vectors(pf->pdev, pf->msix.min, vectors,
                                        PCI_IRQ_MSIX);
-       if (vectors < pf->msix.min)
-               return -ENOMEM;
+       if (vectors < 0)
+               return vectors;
 
        ice_init_irq_tracker(pf, pf->msix.max, vectors);