PM / devfreq: Fix memory leak when fail to register device

When the devfreq_add_device fails to register deivce, the memory
leak of devfreq instance happen. So, this patch fix the memory
leak issue. Before freeing the devfreq instance checks whether
devfreq instance is NULL or not because the device_unregister()
frees the devfreq instance when jumping to the 'err_init'.
It is to prevent the duplicate the kfee(devfreq).

Cc: stable@vger.kernel.org
Fixes: ac4b281176a5 ("PM / devfreq: fix duplicated kfree on devfreq pointer")
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index dea0487..a1c4ee8 100644 (file)
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -564,7 +564,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
        err = device_register(&devfreq->dev);
        if (err) {
                mutex_unlock(&devfreq->lock);
-               goto err_out;
+               goto err_dev;
        }
 
        devfreq->trans_table =  devm_kzalloc(&devfreq->dev,
@@ -610,6 +610,9 @@ err_init:
        mutex_unlock(&devfreq_list_lock);
 
        device_unregister(&devfreq->dev);
+err_dev:
+       if (devfreq)
+               kfree(devfreq);
 err_out:
        return ERR_PTR(err);
 }