Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wang Yufen <wangyufen@huawei.com>
To:     <linux-leds@vger.kernel.org>, <linux-kernel@vger.kernel.org>
CC:     <pavel@ucw.cz>, Wang Yufen <wangyufen@huawei.com>,
        Christian Mauderer <oss@c-mauderer.de>
Subject: [PATCH 12/13] leds: spi-byte: Fix devm vs. non-devm ordering
Date:   Wed, 9 Nov 2022 16:48:13 +0800
Message-ID: <1667983694-15040-13-git-send-email-wangyufen@huawei.com>
In-Reply-To: <1667983694-15040-1-git-send-email-wangyufen@huawei.com>
References: <1667983694-15040-1-git-send-email-wangyufen@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

When non-devm resources are allocated they mustn't be followed by devm
allocations, otherwise it will break the tear down ordering and might
lead to crashes or other bugs during ->remove() stage. Fix this by
wrapping mutex_destroy() call with devm_add_action_or_reset().

Fixes: e9a804d7a428 ("leds: spi-byte: add single byte SPI LED driver")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Cc: Christian Mauderer <oss@c-mauderer.de>
---
 drivers/leds/leds-spi-byte.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c
index 2bc5c99..a169780 100644
--- a/drivers/leds/leds-spi-byte.c
+++ b/drivers/leds/leds-spi-byte.c
@@ -78,6 +78,11 @@ static int spi_byte_brightness_set_blocking(struct led_classdev *dev,
 	return ret;
 }
 
+static void spi_byte_mutex_destroy(void *lock)
+{
+	mutex_destroy(lock);
+}
+
 static int spi_byte_probe(struct spi_device *spi)
 {
 	struct device_node *child;
@@ -101,6 +106,10 @@ static int spi_byte_probe(struct spi_device *spi)
 	strlcpy(led->name, name, sizeof(led->name));
 	led->spi = spi;
 	mutex_init(&led->mutex);
+	ret = devm_add_action_or_reset(dev, spi_byte_mutex_destroy,
+				       &led->mutex);
+	if (ret)
+		return ret;
 	led->cdef = device_get_match_data(dev);
 	led->ldev.name = led->name;
 	led->ldev.brightness = LED_OFF;
@@ -121,25 +130,15 @@ static int spi_byte_probe(struct spi_device *spi)
 					 led->ldev.brightness);
 
 	ret = devm_led_classdev_register(&spi->dev, &led->ldev);
-	if (ret) {
-		mutex_destroy(&led->mutex);
+	if (ret)
 		return ret;
-	}
 	spi_set_drvdata(spi, led);
 
 	return 0;
 }
 
-static void spi_byte_remove(struct spi_device *spi)
-{
-	struct spi_byte_led	*led = spi_get_drvdata(spi);
-
-	mutex_destroy(&led->mutex);
-}
-
 static struct spi_driver spi_byte_driver = {
 	.probe		= spi_byte_probe,
-	.remove		= spi_byte_remove,
 	.driver = {
 		.name		= KBUILD_MODNAME,
 		.of_match_table	= spi_byte_dt_ids,
-- 
1.8.3.1