]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dpaa2-switch: Fix device reference count leak in MAC endpoint handling
authorMa Ke <make24@iscas.ac.cn>
Thu, 17 Jul 2025 02:23:09 +0000 (10:23 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Aug 2025 08:47:30 +0000 (09:47 +0100)
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 <make24@iscas.ac.cn>
Tested-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250717022309.3339976-3-make24@iscas.ac.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c

index a05a8525caa459efbecdc1760cfd0a74bca9e81b..76795bb0b564b76d9c12b1c644aea77d4be85997 100644 (file)
@@ -1447,12 +1447,19 @@ static int dpaa2_switch_port_connect_mac(struct ethsw_port_priv *port_priv)
        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;
@@ -1482,6 +1489,8 @@ err_close_mac:
        dpaa2_mac_close(mac);
 err_free_mac:
        kfree(mac);
+out_put_device:
+       put_device(&dpmac_dev->dev);
        return err;
 }