drm/xe/hwmon: fix uaf on unload
Subsystems (2)
PATCH 1/1 drm/xe/hwmon: fix uaf on unload
It doesn't look like you can mix and match devm_ and drmmm_ for a managed resource. For drmmm the resources are all tracked in drm with its own list, and there is only one devm_ resource for the entire list. If the driver itself also adds some of its own devm resources, then those will be released first. In the case of hwmon the devm_kzalloc will be freed before the drmmm_ action to destroy the mutex allocated within, leading to uaf.
Since hwmon itself wants to use devm, rather use that for the mutex destroy.
--- drivers/gpu/drm/xe/xe_hwmon.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_hwmon.c +10 -1
@@ -584,6 +584,13 @@ xe_hwmon_get_preregistration_info(struct xe_device *xe)xe_hwmon_energy_get (hwmon, &energy); } +static void xe_hwmon_mutex_destroy (void *arg) +{ +struct xe_hwmon *hwmon = arg; + +mutex_destroy (&hwmon->hwmon_lock); +} +void xe_hwmon_register (struct xe_device *xe) {struct device *dev = xe->drm.dev;
@@ -599,7 +606,9 @@ void xe_hwmon_register(struct xe_device *xe) xe->hwmon = hwmon; -drmm_mutex_init (&xe->drm, &hwmon->hwmon_lock); +mutex_init (&hwmon->hwmon_lock); +if (devm_add_action_or_reset (dev, xe_hwmon_mutex_destroy, hwmon)) +return ;/* primary GT to access device level properties */ hwmon->gt = xe->tiles[0 ].primary_gt;
Signature · 1 line
2.41.0
Quoted 8 lines · Matthew Auld
It doesn't look like you can mix and match
devm_anddrmmm_for a managed resource. For drmmm the resources are all tracked in drm with its own list, and there is only onedevm_resource for the entire list. If the driver itself also adds some of its own devm resources, then those will be released first. In the case of hwmon thedevm_kzallocwill be freed before thedrmmm_action to destroy the mutex allocated within, leading to uaf.
Quoted 7 lines
Since hwmon itself wants to use devm, rather use that for the mutex destroy.
Signed-off-by Matthew Auld <[email protected]>Cc Badal Nilawar <[email protected]>Cc Rodrigo Vivi <[email protected]>
Quoted 36 lines
--- drivers/gpu/drm/xe/xe_hwmon.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/xe/xe_hwmon.c +10
-1@@ -584,6 +584,13 @@ xe_hwmon_get_preregistration_info(struct xe_device *xe)xe_hwmon_energy_get (hwmon, &energy); } +static void xe_hwmon_mutex_destroy (void *arg) +{ +struct xe_hwmon *hwmon = arg; + +mutex_destroy (&hwmon->hwmon_lock); +} +void xe_hwmon_register (struct xe_device *xe) {struct device *dev = xe->drm.dev;@@ -599,7 +606,9 @@ void xe_hwmon_register(struct xe_device *xe) xe->hwmon = hwmon; -drmm_mutex_init (&xe->drm, &hwmon->hwmon_lock); +mutex_init (&hwmon->hwmon_lock); +if (devm_add_action_or_reset (dev, xe_hwmon_mutex_destroy, hwmon)) +return ;/* primary GT to access device level properties */ hwmon->gt = xe->tiles[0 ].primary_gt;Signature · 1 line
2.41.0
Quoted 8 lines · Matthew Auld
It doesn't look like you can mix and match
devm_anddrmmm_for a managed resource. For drmmm the resources are all tracked in drm with its own list, and there is only onedevm_resource for the entire list. If the driver itself also adds some of its own devm resources, then those will be released first. In the case of hwmon thedevm_kzallocwill be freed before thedrmmm_action to destroy the mutex allocated within, leading to uaf.
Quoted 7 lines
Since hwmon itself wants to use devm, rather use that for the mutex destroy.
Signed-off-by Matthew Auld <[email protected]>Cc Badal Nilawar <[email protected]>Cc Rodrigo Vivi <[email protected]>
Quoted 33 lines
--- drivers/gpu/drm/xe/xe_hwmon.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/xe/xe_hwmon.c +10
-1@@ -584,6 +584,13 @@ xe_hwmon_get_preregistration_info(struct xe_device *xe)xe_hwmon_energy_get (hwmon, &energy); } +static void xe_hwmon_mutex_destroy (void *arg) +{ +struct xe_hwmon *hwmon = arg; + +mutex_destroy (&hwmon->hwmon_lock); +} +void xe_hwmon_register (struct xe_device *xe) {struct device *dev = xe->drm.dev;@@ -599,7 +606,9 @@ void xe_hwmon_register(struct xe_device *xe) xe->hwmon = hwmon; -drmm_mutex_init (&xe->drm, &hwmon->hwmon_lock); +mutex_init (&hwmon->hwmon_lock); +if (devm_add_action_or_reset (dev, xe_hwmon_mutex_destroy, hwmon)) +return ;/* primary GT to access device level properties */ hwmon->gt = xe->tiles[0 ].primary_gt;