From: Yangtao Li <tiny.windzz@gmail.com>
To: myungjoo.ham@samsung.com, kyungmin.park@samsung.com,
cw00.choi@samsung.com, linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Yangtao Li <tiny.windzz@gmail.com>
Subject: [PATCH 2/3] PM / devfreq: fix missing check of return value in devfreq_add_device()
Date: Sat, 19 Jan 2019 11:04:53 -0500 [thread overview]
Message-ID: <20190119160454.23151-2-tiny.windzz@gmail.com> (raw)
In-Reply-To: <20190119160454.23151-1-tiny.windzz@gmail.com>
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>
---
drivers/devfreq/devfreq.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 076b1c2f40a4..923889229a0b 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -688,10 +688,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);
@@ -725,7 +737,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:
--
2.17.0
next prev parent reply other threads:[~2019-01-19 16:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20190119183407epcas1p4958e4526d07c36605307c49b0c0e2e2c@epcas1p4.samsung.com>
2019-01-19 16:04 ` [PATCH 1/3] PM / devfreq: fix indentation in devfreq_add_device() Yangtao Li
2019-01-19 16:04 ` Yangtao Li [this message]
2019-01-19 16:04 ` [PATCH 3/3] PM / devfreq: fix mem leak " Yangtao Li
2019-01-21 1:42 ` Chanwoo Choi
[not found] ` <CGME20190119183505epcas1p15efda0795b3c94601bcb2f442ab15232@epcms1p5>
2019-01-21 1:23 ` MyungJoo Ham
[not found] ` <CGME20190119183509epcas1p27012fefeafe539c3f82030caf85ad308@epcms1p1>
2019-01-21 1:27 ` [PATCH 2/3] PM / devfreq: fix missing check of return value " MyungJoo Ham
2019-01-21 1:58 ` [PATCH 1/3] PM / devfreq: fix indentation " Chanwoo Choi
2019-01-21 16:39 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190119160454.23151-2-tiny.windzz@gmail.com \
--to=tiny.windzz@gmail.com \
--cc=cw00.choi@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).