Skip to content

Commit 1c24e5f

Browse files
Hans de GoedeWolfram Sang
authored andcommitted
i2c: core: Fix double-free of fwnode in i2c_unregister_device()
Before commit df6d727 ("i2c: core: Do not dereference fwnode in struct device"), i2c_unregister_device() only called fwnode_handle_put() on of_node-s in the form of calling of_node_put(client->dev.of_node). But after this commit the i2c_client's fwnode now unconditionally gets fwnode_handle_put() on it. When the i2c_client has no primary (ACPI / OF) fwnode but it does have a software fwnode, the software-node will be the primary node and fwnode_handle_put() will put() it. But for the software fwnode device_remove_software_node() will also put() it leading to a double free: [ 82.665598] ------------[ cut here ]------------ [ 82.665609] refcount_t: underflow; use-after-free. [ 82.665808] WARNING: CPU: 3 PID: 1502 at lib/refcount.c:28 refcount_warn_saturate+0xba/0x11 ... [ 82.666830] RIP: 0010:refcount_warn_saturate+0xba/0x110 ... [ 82.666962] <TASK> [ 82.666971] i2c_unregister_device+0x60/0x90 Fix this by not calling fwnode_handle_put() when the primary fwnode is a software-node. Fixes: df6d727 ("i2c: core: Do not dereference fwnode in struct device") Cc: [email protected] Signed-off-by: Hans de Goede <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent f61389a commit 1c24e5f

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/i2c/i2c-core-base.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,13 @@ void i2c_unregister_device(struct i2c_client *client)
10661066
of_node_clear_flag(to_of_node(fwnode), OF_POPULATED);
10671067
else if (is_acpi_device_node(fwnode))
10681068
acpi_device_clear_enumerated(to_acpi_device_node(fwnode));
1069-
fwnode_handle_put(fwnode);
1069+
1070+
/*
1071+
* If the primary fwnode is a software node it is free-ed by
1072+
* device_remove_software_node() below, avoid double-free.
1073+
*/
1074+
if (!is_software_node(fwnode))
1075+
fwnode_handle_put(fwnode);
10701076

10711077
device_remove_software_node(&client->dev);
10721078
device_unregister(&client->dev);

0 commit comments

Comments
 (0)