OSDN Git Service

PM / devfreq: fix missing check of return value in devfreq_add_device()
authorYangtao Li <tiny.windzz@gmail.com>
Sat, 19 Jan 2019 16:04:53 +0000 (11:04 -0500)
committerMyungJoo Ham <myungjoo.ham@samsung.com>
Tue, 16 Apr 2019 00:29:18 +0000 (09:29 +0900)
devm_kzalloc() could fail, so insert a check of its return value. And
if it fails, returns -ENOMEM.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
drivers/devfreq/devfreq.c

index fa1bdde..4af608a 100644 (file)
@@ -689,10 +689,22 @@ struct devfreq *devfreq_add_device(struct device *dev,
                                         devfreq->profile->max_state,
                                         devfreq->profile->max_state),
                             GFP_KERNEL);
+       if (!devfreq->trans_table) {
+               mutex_unlock(&devfreq->lock);
+               err = -ENOMEM;
+               goto err_devfreq;
+       }
+
        devfreq->time_in_state = devm_kcalloc(&devfreq->dev,
                                                devfreq->profile->max_state,
                                                sizeof(unsigned long),
                                                GFP_KERNEL);
+       if (!devfreq->time_in_state) {
+               mutex_unlock(&devfreq->lock);
+               err = -ENOMEM;
+               goto err_devfreq;
+       }
+
        devfreq->last_stat_updated = jiffies;
 
        srcu_init_notifier_head(&devfreq->transition_notifier_list);
@@ -726,7 +738,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
 
 err_init:
        mutex_unlock(&devfreq_list_lock);
-
+err_devfreq:
        devfreq_remove_device(devfreq);
        devfreq = NULL;
 err_dev: