]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: dsa: microchip: common: Fix checks on irq_find_mapping()
authorBastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
Thu, 20 Nov 2025 09:12:00 +0000 (10:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Dec 2025 21:12:44 +0000 (06:12 +0900)
commit 7b3c09e1667977edee11de94a85e2593a7c15e87 upstream.

irq_find_mapping() returns a positive IRQ number or 0 if no IRQ is found
but it never returns a negative value. However, on each
irq_find_mapping() call, we verify that the returned value isn't
negative.

Fix the irq_find_mapping() checks to enter error paths when 0 is
returned. Return -EINVAL in such cases.

CC: stable@vger.kernel.org
Fixes: c9cd961c0d43 ("net: dsa: microchip: lan937x: add interrupt support for port phy link")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
Link: https://patch.msgid.link/20251120-ksz-fix-v6-1-891f80ae7f8f@bootlin.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/dsa/microchip/ksz_common.c

index aa10131f80f95bd7f4dff3100cbb139a5b2d6a28..e126f96a8d7d5ad790e85ea278a9aeeca2e6be1b 100644 (file)
@@ -1693,8 +1693,8 @@ static int ksz_irq_phy_setup(struct ksz_device *dev)
                if (BIT(phy) & ds->phys_mii_mask) {
                        irq = irq_find_mapping(dev->ports[phy].pirq.domain,
                                               PORT_SRC_PHY_INT);
-                       if (irq < 0) {
-                               ret = irq;
+                       if (!irq) {
+                               ret = -EINVAL;
                                goto out;
                        }
                        ds->slave_mii_bus->irq[phy] = irq;
@@ -1918,8 +1918,8 @@ static int ksz_pirq_setup(struct ksz_device *dev, u8 p)
        snprintf(pirq->name, sizeof(pirq->name), "port_irq-%d", p);
 
        pirq->irq_num = irq_find_mapping(dev->girq.domain, p);
-       if (pirq->irq_num < 0)
-               return pirq->irq_num;
+       if (!pirq->irq_num)
+               return -EINVAL;
 
        return ksz_irq_common_setup(dev, pirq);
 }