Commit d584221e authored by Johan Hovold's avatar Johan Hovold Committed by Pavel Machek
Browse files

leds: lm3533: fix use-after-free on unbind 



Several MFD child drivers register their class devices directly under
the parent device. This means you cannot blindly do devres conversions
so that deregistration ends up being tied to the parent device,
something which leads to use-after-free on driver unbind when the class
device is released while still being registered.

Fixes: 50154e29 ("leds: lm3533: Use devm_led_classdev_register")
Cc: stable <stable@vger.kernel.org>     # 4.6
Cc: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
parent 6f4aa357

drivers/leds/leds-lm3533.c

+9 −3
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static int lm3533_led_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, led);



	ret = devm_led_classdev_register(pdev->dev.parent, &led->cdev);

	ret = led_classdev_register(pdev->dev.parent, &led->cdev);

	if (ret) {

		dev_err(&pdev->dev, "failed to register LED %d\n", pdev->id);

		return ret;
@@ -704,13 +704,18 @@ static int lm3533_led_probe(struct platform_device *pdev) 


	ret = lm3533_led_setup(led, pdata);

	if (ret)

		return ret;

		goto err_deregister;



	ret = lm3533_ctrlbank_enable(&led->cb);

	if (ret)

		return ret;

		goto err_deregister;



	return 0;



err_deregister:

	led_classdev_unregister(&led->cdev);



	return ret;

}



static int lm3533_led_remove(struct platform_device *pdev)
@@ -720,6 +725,7 @@ static int lm3533_led_remove(struct platform_device *pdev) 
	dev_dbg(&pdev->dev, "%s\n", __func__);



	lm3533_ctrlbank_disable(&led->cb);

	led_classdev_unregister(&led->cdev);



	return 0;

}