hwmon: (nzxt-smart2) handle failure of devm_add_action in nzxt_smart2_hid_probe
authorKang Chen <void0red@gmail.com>
Mon, 27 Feb 2023 09:15:34 +0000 (17:15 +0800)
committerGuenter Roeck <linux@roeck-us.net>
Wed, 19 Apr 2023 14:08:31 +0000 (07:08 -0700)
1. replace the devm_add_action with devm_add_action_or_reset to ensure
the mutex lock can be destroyed when it fails.
2. use local wrapper function mutex_fini instead of mutex_destroy to
avoid undefined behaviours.
3. add a check of devm_add_action_or_reset and return early when it fails.

Link: https://lore.kernel.org/all/f5043281-9b3e-e454-16fe-ef4cde36dfdb@roeck-us.net
Signed-off-by: Kang Chen <void0red@gmail.com>
Link: https://lore.kernel.org/r/20230227091534.907101-1-void0red@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/nzxt-smart2.c

index a8e72d8fd06050db6b96e30936b872e9c89138d6..e5edf8071f398f00653941b3eb77e402111930dc 100644 (file)
@@ -721,6 +721,11 @@ static int __maybe_unused nzxt_smart2_hid_reset_resume(struct hid_device *hdev)
        return init_device(drvdata, drvdata->update_interval);
 }
 
+static void mutex_fini(void *lock)
+{
+       mutex_destroy(lock);
+}
+
 static int nzxt_smart2_hid_probe(struct hid_device *hdev,
                                 const struct hid_device_id *id)
 {
@@ -737,8 +742,9 @@ static int nzxt_smart2_hid_probe(struct hid_device *hdev,
        init_waitqueue_head(&drvdata->wq);
 
        mutex_init(&drvdata->mutex);
-       devm_add_action(&hdev->dev, (void (*)(void *))mutex_destroy,
-                       &drvdata->mutex);
+       ret = devm_add_action_or_reset(&hdev->dev, mutex_fini, &drvdata->mutex);
+       if (ret)
+               return ret;
 
        ret = hid_parse(hdev);
        if (ret)