platform driver: fix use-after-free in platform_device_del()

In platform_device_del(), the device is still used after a call to device_del(). At this point there is no guarantee that the device is still there and there could be a use-after-free access. Move the call to device_remove_properties() before device_del() to fix that. Signed-off-by: Jerome Marchand <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
0day-ci · Aug 31, 2016 · c90aab9 · c90aab9
1 parent bea5b15
commit c90aab9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
@@ -434,6 +434,7 @@ void platform_device_del(struct platform_device *pdev)
 	int i;
 
 	if (pdev) {
+		device_remove_properties(&pdev->dev);
 		device_del(&pdev->dev);
 
 		if (pdev->id_auto) {
@@ -446,8 +447,6 @@ void platform_device_del(struct platform_device *pdev)
 			if (r->parent)
 				release_resource(r);
 		}
-
-		device_remove_properties(&pdev->dev);
 	}
 }
 EXPORT_SYMBOL_GPL(platform_device_del);