Commit 9e437bc3 authored by George Stark's avatar George Stark Committed by Tengda Wu
Browse files

leds: mlxreg: Use devm_mutex_init() for mutex initialization 

mainline inclusion
from mainline-v6.10-rc1
commit efc347b9efee1c2b081f5281d33be4559fa50a16
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGS4V
CVE: CVE-2024-42129

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=efc347b9efee1c2b081f5281d33be4559fa50a16



--------------------------------

In this driver LEDs are registered using devm_led_classdev_register()
so they are automatically unregistered after module's remove() is done.
led_classdev_unregister() calls module's led_set_brightness() to turn off
the LEDs and that callback uses mutex which was destroyed already
in module's remove() so use devm API instead.

Signed-off-by: default avatarGeorge Stark <gnstark@salutedevices.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20240411161032.609544-8-gnstark@salutedevices.com


Signed-off-by: default avatarLee Jones <lee@kernel.org>
Fixes: 386570d7 ("leds: add driver for support Mellanox regmap LEDs for BMC and x86 platform")

Conflicts:
	drivers/leds/leds-mlxreg.c
[This is because we did not backport 606130209230 ("leds: Convert all
platform drivers to return void")]
Signed-off-by: default avatarTengda Wu <wutengda2@huawei.com>
parent 87ac7d79

drivers/leds/leds-mlxreg.c

+5 −11
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ static int mlxreg_led_probe(struct platform_device *pdev) 
{

	struct mlxreg_core_platform_data *led_pdata;

	struct mlxreg_led_priv_data *priv;

	int err;



	led_pdata = dev_get_platdata(&pdev->dev);

	if (!led_pdata) {
@@ -268,28 +269,21 @@ static int mlxreg_led_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	mutex_init(&priv->access_lock);

	err = devm_mutex_init(&pdev->dev, &priv->access_lock);

	if (err)

		return err;



	priv->pdev = pdev;

	priv->pdata = led_pdata;



	return mlxreg_led_config(priv);

}



static int mlxreg_led_remove(struct platform_device *pdev)

{

	struct mlxreg_led_priv_data *priv = dev_get_drvdata(&pdev->dev);



	mutex_destroy(&priv->access_lock);



	return 0;

}



static struct platform_driver mlxreg_led_driver = {

	.driver = {

	    .name = "leds-mlxreg",

	},

	.probe = mlxreg_led_probe,

	.remove = mlxreg_led_remove,

};



module_platform_driver(mlxreg_led_driver);