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 8326533F37E; Wed, 3 Dec 2025 15:54:33 +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=1764777273; cv=none; b=khtqKgYPPbSYFWnU6qQ+S+myNb9Cdbk/UPHQf6Pc7l+Nk9+nHphB9Xf6VTk4Hmv32pViTHgtQ3mOtOW87Y1CYDHyLzZDCRrdlFx66sdNoiR+z6ErfvbRATc/3qRY8skb6z0uQMJ4OKFOPp3vAyR+L+85iJbF1tWmB1q4xW8NQBw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777273; c=relaxed/simple; bh=4JboxKlYkKEek98rT0VfcdMDhRGZ9OKYwLAMQEMHJWk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZHMQpA9YykvCO4U0ZhBGcuyfMkm2t8dIHnjphZ3iDRpR9POF2w12qokhmopVgR46sCvitIr4M4gqJ00HP4sz6v0KVf8D60mc3JeqAXbWKEQaQKABWn4QpXss4zn+2KQ1H/SyYahgE2Y22L65WuVou4yBr5RBW05hIYN5Oy/ikO0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZZaxjPv8; 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="ZZaxjPv8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4168C4CEF5; Wed, 3 Dec 2025 15:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764777273; bh=4JboxKlYkKEek98rT0VfcdMDhRGZ9OKYwLAMQEMHJWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZZaxjPv8AcqqkZP1zUhPrFYJhRLHkbz2GJqcqJxSXipUJGVzs8LTUUrG81xwMLG++ a0iTuMWrQnxZilAFxWBT1IS/OUTfAl8/YFyiRj0T3AJId46cpn3G4RiUso5xISqpYd MbNclJqFTdzoeQZlEos8gz+tViQfC2AQRLdjuEEY= 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.17 134/146] net: dsa: microchip: common: Fix checks on irq_find_mapping() Date: Wed, 3 Dec 2025 16:28:32 +0100 Message-ID: <20251203152351.376703817@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152346.456176474@linuxfoundation.org> References: <20251203152346.456176474@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.17-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 @@ -2587,8 +2587,8 @@ static int ksz_irq_phy_setup(struct ksz_ irq = irq_find_mapping(dev->ports[port].pirq.domain, PORT_SRC_PHY_INT); - if (irq < 0) { - ret = irq; + if (!irq) { + ret = -EINVAL; goto out; } ds->user_mii_bus->irq[phy] = irq; @@ -2952,8 +2952,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); }