From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D9B831619D; Wed, 3 Dec 2025 16:54:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764780846; cv=none; b=ARBtK9+vDBoEf1d9PjII2JVfAIDgF9Ry+oTHb+PS97TAfpDlCXbTKC9ex76+sUabfj28dep7WUvxsm1H0QXhu6V99EAhV2f3E4wS4u0/6qus11W/54GdQ1MgAAdJGFoKmpDzdjkkMGlHAlD8jK2hJoxM1b2fUN7DiY1o7eL1QG0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764780846; c=relaxed/simple; bh=w2cSLhq/bkaDXkBc4HUyYYl+zJVuMEDSNGc6wGfOjns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CoNVmlX5h/HKHEdfs9CTDfctEVdSQcl5kYD1oBoOL1qMi1VayeSxOcVe5ivCtnPOr8pZx/oCxo7qBmeADS1dxV96W02GwAacnsznc8IegjXPbXFNNHdMnD8n8naD+o8pf5m5y7RuwDCJuzs0SbkhJvz6e9WnboiNqhjS6Cqxm0A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=I5T9Zsw4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="I5T9Zsw4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6705C4CEF5; Wed, 3 Dec 2025 16:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764780846; bh=w2cSLhq/bkaDXkBc4HUyYYl+zJVuMEDSNGc6wGfOjns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I5T9Zsw4R9lziXUwd26wzeiXqTE5+YGNLd/bGY0uhoVcIlB+l+cCd/WwvHJe6olXy w6aYPhTLMKvWhSJjNvQlUQiEY97X+qzgdROFz8J13JREYNvJLTXHAahcQFayNXPvEP 84Rodl5sYCa6Y9Pf6yTlDHqV9XdHJNfW37MIkBso= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andrew Lunn , "Bastien Curutchet (Schneider Electric)" , Paolo Abeni Subject: [PATCH 6.12 108/132] net: dsa: microchip: common: Fix checks on irq_find_mapping() Date: Wed, 3 Dec 2025 16:29:47 +0100 Message-ID: <20251203152347.286633740@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152343.285859633@linuxfoundation.org> References: <20251203152343.285859633@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bastien Curutchet (Schneider Electric) 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 Signed-off-by: Bastien Curutchet (Schneider Electric) Link: https://patch.msgid.link/20251120-ksz-fix-v6-1-891f80ae7f8f@bootlin.com Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/microchip/ksz_common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -2254,8 +2254,8 @@ static int ksz_irq_phy_setup(struct ksz_ 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->user_mii_bus->irq[phy] = irq; @@ -2479,8 +2479,8 @@ static int ksz_pirq_setup(struct ksz_dev 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); }