Commit 7764c62f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devprop-5.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull device properties framework fix from Rafael Wysocki:
 "Fix a NULL pointer dereference introduced by a recent commit and
  occurring when device_remove_software_node() is used with a device
  that has never been registered (Heikki Krogerus)"

* tag 'devprop-5.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  software node: Handle software node injection to an existing device properly
parents b960e014 5dca69e2

drivers/base/swnode.c

+12 −4
Original line number Diff line number Diff line
@@ -1045,6 +1045,14 @@ int device_add_software_node(struct device *dev, const struct software_node *nod 
	}



	set_secondary_fwnode(dev, &swnode->fwnode);



	/*

	 * If the device has been fully registered by the time this function is

	 * called, software_node_notify() must be called separately so that the

	 * symlinks get created and the reference count of the node is kept in

	 * balance.

	 */

	if (device_is_registered(dev))

		software_node_notify(dev, KOBJ_ADD);



	return 0;
@@ -1065,6 +1073,7 @@ void device_remove_software_node(struct device *dev) 
	if (!swnode)

		return;



	if (device_is_registered(dev))

		software_node_notify(dev, KOBJ_REMOVE);

	set_secondary_fwnode(dev, NULL);

	kobject_put(&swnode->kobj);
@@ -1119,8 +1128,7 @@ int software_node_notify(struct device *dev, unsigned long action) 


	switch (action) {

	case KOBJ_ADD:

		ret = sysfs_create_link_nowarn(&dev->kobj, &swnode->kobj,

					       "software_node");

		ret = sysfs_create_link(&dev->kobj, &swnode->kobj, "software_node");

		if (ret)

			break;