Unverified Commit d4ea89d4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12915 CVE-2022-48961 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/66C6QGOXPIVMECI4CV7YZ5RZVFBKHUJD/ 
Ioana Ciornei (1):
  net: mdio: use device_set_node() to setup both fwnode and of

Zeng Heng (1):
  net: mdio: fix unbalanced fwnode reference count in
    mdio_device_release()


-- 
2.9.5
 
https://gitee.com/src-openeuler/kernel/issues/IAYRIU 
 
Link:https://gitee.com/openeuler/kernel/pulls/12915

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 554a17c2 49968800

drivers/net/mdio/of_mdio.c

+6 −6
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, 
static int of_mdiobus_register_device(struct mii_bus *mdio,

				      struct device_node *child, u32 addr)

{

	struct fwnode_handle *fwnode = of_fwnode_handle(child);

	struct mdio_device *mdiodev;

	int rc;
@@ -161,15 +162,15 @@ static int of_mdiobus_register_device(struct mii_bus *mdio, 
	/* Associate the OF node with the device structure so it

	 * can be looked up later.

	 */

	of_node_get(child);

	mdiodev->dev.of_node = child;

	mdiodev->dev.fwnode = of_fwnode_handle(child);

	fwnode_handle_get(fwnode);

	device_set_node(&mdiodev->dev, fwnode);



	/* All data is now stored in the mdiodev struct; register it. */

	rc = mdio_device_register(mdiodev);

	if (rc) {

		device_set_node(&mdiodev->dev, NULL);

		fwnode_handle_put(fwnode);

		mdio_device_free(mdiodev);

		of_node_put(child);

		return rc;

	}
@@ -262,8 +263,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) 
	 * the device tree are populated after the bus has been registered */

	mdio->phy_mask = ~0;



	mdio->dev.of_node = np;

	mdio->dev.fwnode = of_fwnode_handle(np);

	device_set_node(&mdio->dev, of_fwnode_handle(np));



	/* Get bus level PHY reset GPIO details */

	mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY;

drivers/net/phy/mdio_bus.c

+1 −2
Original line number Diff line number Diff line
@@ -463,8 +463,7 @@ static void of_mdiobus_link_mdiodev(struct mii_bus *bus, 
			continue;



		if (addr == mdiodev->addr) {

			dev->of_node = child;

			dev->fwnode = of_fwnode_handle(child);

			device_set_node(dev, of_fwnode_handle(child));

			return;

		}

	}

drivers/net/phy/mdio_device.c

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/unistd.h>

#include <linux/property.h>



void mdio_device_free(struct mdio_device *mdiodev)

{
@@ -30,6 +31,7 @@ EXPORT_SYMBOL(mdio_device_free); 


static void mdio_device_release(struct device *dev)

{

	fwnode_handle_put(dev->fwnode);

	kfree(to_mdio_device(dev));

}