Merge tag 'driver-core-7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core

Pull driver core fix from Danilo Krummrich:

 - Fix a use-after-free during device removal when a child device reuses
   its parent's managed software node (affecting Xe)

* tag 'driver-core-7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core:
  software node: only let the owner release a managed node
This commit is contained in:
Linus Torvalds
2026-11-15 13:30:32 -08:00
+4 -3
View File
@@ -29,6 +29,8 @@ struct swnode {
struct fwnode_handle fwnode;
const struct software_node *node;
int id;
/* Device the managed node's lifetime is tied to. */
struct device *owner;
/* hierarchy */
struct ida child_ids;
@@ -37,7 +39,6 @@ struct swnode {
struct swnode *parent;
unsigned int allocated:1;
unsigned int managed:1;
};
static DEFINE_IDA(swnode_root_ids);
@@ -1145,7 +1146,7 @@ int device_create_managed_software_node(struct device *dev,
if (IS_ERR(fwnode))
return PTR_ERR(fwnode);
to_swnode(fwnode)->managed = true;
to_swnode(fwnode)->owner = dev;
set_secondary_fwnode(dev, fwnode);
if (device_is_registered(dev))
@@ -1208,7 +1209,7 @@ void software_node_notify_remove(struct device *dev)
swnode_put(swnode);
if (swnode->managed) {
if (swnode->owner == dev) {
set_secondary_fwnode(dev, NULL);
swnode_put(swnode);
}