i3c: master: Fix info leak and UAF in device unregister path
PATCH 1/1 i3c: master: Fix info leak and UAF in device unregister path
i3c_master_unregister_i3c_devs() clears i3cdev->dev->desc before calling device_unregister(). During device_unregister(), device_del() emits a KOBJ_REMOVE uevent and unbinds the driver while the device descriptor is still expected to be valid. As a result, i3c_device_uevent() and a racing modalias_show() can observe a NULL desc and fall back to an uninitialized stack struct i3c_device_info, leaking kernel stack contents in the generated modalias. Driver .remove() callbacks may also encounter an unexpected NULL desc during unbind.
Keep desc valid until device_unregister() has completed. Since device_unregister() drops the device reference and may free the device, take an extra reference with get_device() before unregistering. Clear desc afterwards and release the extra reference with put_device(). This preserves the release-time invariant that desc must be NULL while avoiding both the information leak and a potential use-after-free from writing desc after the device has been released.
--- drivers/i3c/master.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/i3c/master.c +5 -4
@@ -3083,11 +3083,12 @@ static void i3c_master_unregister_i3c_devs(struct i3c_master_controller *master)if (!i3cdev->dev)continue ; - i3cdev->dev->desc =NULL ; -if (device_is_registered (&i3cdev->dev->dev)) +if (device_is_registered (&i3cdev->dev->dev)) { +get_device (&i3cdev->dev->dev);device_unregister (&i3cdev->dev->dev); -else -put_device (&i3cdev->dev->dev); + } + i3cdev->dev->desc =NULL ; +put_device (&i3cdev->dev->dev); i3cdev->dev =NULL ; } }
Signature · 1 line
2.53.0
Quoted 18 lines · Adrian Hunter
i3c_master_unregister_i3c_devs()clearsi3cdev->dev->descbefore callingdevice_unregister(). Duringdevice_unregister(),device_del()emits aKOBJ_REMOVEuevent and unbinds the driver while the device descriptor is still expected to be valid. As a result,i3c_device_uevent()and a racingmodalias_show()can observe a NULL desc and fall back to an uninitialized stack structi3c_device_info, leaking kernel stack contents in the generated modalias. Driver .remove() callbacks may also encounter an unexpected NULL desc during unbind.Keep desc valid until
device_unregister()has completed. Sincedevice_unregister()drops the device reference and may free the device, take an extra reference withget_device()before unregistering. Clear desc afterwards and release the extra reference withput_device(). This preserves the release-time invariant that desc must be NULL while avoiding both the information leak and a potential use-after-free from writing desc after the device has been released.
Quoted 6 lines
Reported-by [email protected]Fixes 3a379bbcea0a ("i3c: Add core I3C infrastructure")Signed-off-by Adrian Hunter <[email protected]>---
Quoted 27 lines
drivers/i3c/master.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/i3c/master.c +5
-5@@ -3083,11 +3083,12 @@ static void i3c_master_unregister_i3c_devs(struct i3c_master_controller *master)if (!i3cdev->dev)continue ; - i3cdev->dev->desc =NULL ; -if (device_is_registered (&i3cdev->dev->dev)) +if (device_is_registered (&i3cdev->dev->dev)) { +get_device (&i3cdev->dev->dev);device_unregister (&i3cdev->dev->dev); -else -put_device (&i3cdev->dev->dev); + } + i3cdev->dev->desc =NULL ; +put_device (&i3cdev->dev->dev); i3cdev->dev =NULL ; } } --2.53.0
Quoted 11 lines · Adrian Hunter
i3c_master_unregister_i3c_devs()clearsi3cdev->dev->descbefore callingdevice_unregister(). Duringdevice_unregister(),device_del()emits aKOBJ_REMOVEuevent and unbinds the driver while the device descriptor is still expected to be valid. As a result,i3c_device_uevent()and a racingmodalias_show()can observe a NULL desc and fall back to an uninitialized stack structi3c_device_info, leaking kernel stack contents in the generated modalias. Driver .remove() callbacks may also encounter an unexpected NULL desc during unbind.[...]
Applied, thanks!
[1/1] i3c: master: Fix info leak and UAF in device unregister path
https://git.kernel.org/i3c/c/6f056a769b9f
Best regards,
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com