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 3CD8F227EA8; Tue, 26 Aug 2025 13:41:11 +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=1756215671; cv=none; b=s9XNIyZaJZNQB1cBxXblCdjicyPWjBa7JyJmgbreZMZZhVC5z5BhupMNSdMwPaWWtptBHlD1D4vNpVzWvKoJXvQDOnsUtk2x9QMc75Uy0E36A3C7knoAudm682f2R49Sn4dQyzkZJc9z7klzOJLmVzooWjFHM9Z2QVXI1V49WKs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756215671; c=relaxed/simple; bh=fgNp2QcUav5iuY/oiLD3nmC+apwCHLYi9vAaTBzxs14=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nmK6BkgqPSvRE1VZltC2B1MYOT7aSoEBOC4fQgNjkq24LXPd63WhK9JviCdHSek8sQwCdPS19g1yTZQm1WD8vGA8sMlVpZh0cqU2MExW7E1kwZxpWcMefJPStQvU/k3H89uFHazDP8ms/owXgmcsR89ZplJbVGFiv8FtdDIFplA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Yfhvi0oY; 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="Yfhvi0oY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0AD0C113D0; Tue, 26 Aug 2025 13:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756215671; bh=fgNp2QcUav5iuY/oiLD3nmC+apwCHLYi9vAaTBzxs14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yfhvi0oYyoTQSeZ+WVmGL1j8xHL6aNkUOrEqfGwRFrUVT+DowYb+l4qTg8WjiOaHL fpq8wlhW6D6ZyD3Zz9rDukabDsq59smEx5SdAagHYrR5Iw55XqTafSyZaU3DveG6KS 8L3yzwlWuQCr5eiCfdhB7BueJarpsvbB6QLRPNN4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ma Ke , Ioana Ciornei , Simon Horman , Jakub Kicinski Subject: [PATCH 5.15 094/644] dpaa2-switch: Fix device reference count leak in MAC endpoint handling Date: Tue, 26 Aug 2025 13:03:05 +0200 Message-ID: <20250826110948.833715073@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110946.507083938@linuxfoundation.org> References: <20250826110946.507083938@linuxfoundation.org> User-Agent: quilt/0.68 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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ma Ke commit 96e056ffba912ef18a72177f71956a5b347b5177 upstream. The fsl_mc_get_endpoint() function uses device_find_child() for localization, which implicitly calls get_device() to increment the device's reference count before returning the pointer. However, the caller dpaa2_switch_port_connect_mac() fails to properly release this reference in multiple scenarios. We should call put_device() to decrement reference count properly. As comment of device_find_child() says, 'NOTE: you will need to drop the reference with put_device() after use'. Found by code review. Cc: stable@vger.kernel.org Fixes: 84cba72956fd ("dpaa2-switch: integrate the MAC endpoint support") Signed-off-by: Ma Ke Tested-by: Ioana Ciornei Reviewed-by: Ioana Ciornei Reviewed-by: Simon Horman Link: https://patch.msgid.link/20250717022309.3339976-3-make24@iscas.ac.cn Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c @@ -1435,12 +1435,19 @@ static int dpaa2_switch_port_connect_mac if (PTR_ERR(dpmac_dev) == -EPROBE_DEFER) return PTR_ERR(dpmac_dev); - if (IS_ERR(dpmac_dev) || dpmac_dev->dev.type != &fsl_mc_bus_dpmac_type) + if (IS_ERR(dpmac_dev)) return 0; + if (dpmac_dev->dev.type != &fsl_mc_bus_dpmac_type) { + err = 0; + goto out_put_device; + } + mac = kzalloc(sizeof(*mac), GFP_KERNEL); - if (!mac) - return -ENOMEM; + if (!mac) { + err = -ENOMEM; + goto out_put_device; + } mac->mc_dev = dpmac_dev; mac->mc_io = port_priv->ethsw_data->mc_io; @@ -1468,6 +1475,8 @@ err_close_mac: port_priv->mac = NULL; err_free_mac: kfree(mac); +out_put_device: + put_device(&dpmac_dev->dev); return err; }