| Message ID | 20180621080618.gzbm3qgbp42pdirg@kili.mountain (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On 21-06-18, 11:06, Dan Carpenter wrote: > We should return if get_cpu_device() fails or it leads to a NULL > dereference. Also dev_pm_opp_of_get_opp_desc_node() returns NULL on > error, it never returns error pointers. > > Fixes: 46e2856b8e18 ("cpufreq: Add Kryo CPU scaling driver") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c > index d049fe4b80c4..b54049614744 100644 > --- a/drivers/cpufreq/qcom-cpufreq-kryo.c > +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c > @@ -86,8 +86,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) > int ret; > > cpu_dev = get_cpu_device(0); > - if (NULL == cpu_dev) > - ret = -ENODEV; > + if (!cpu_dev) > + return -ENODEV; > > msm8996_version = qcom_cpufreq_kryo_get_msm_id(); > if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { > @@ -96,8 +96,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) > } > > np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); > - if (IS_ERR(np)) > - return PTR_ERR(np); > + if (!np) > + return -ENOENT; > > ret = of_device_is_compatible(np, "operating-points-v2-kryo-cpu"); > if (!ret) { Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Thursday, June 21, 2018 10:55:27 AM CEST Viresh Kumar wrote: > On 21-06-18, 11:06, Dan Carpenter wrote: > > We should return if get_cpu_device() fails or it leads to a NULL > > dereference. Also dev_pm_opp_of_get_opp_desc_node() returns NULL on > > error, it never returns error pointers. > > > > Fixes: 46e2856b8e18 ("cpufreq: Add Kryo CPU scaling driver") > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > > > diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c > > index d049fe4b80c4..b54049614744 100644 > > --- a/drivers/cpufreq/qcom-cpufreq-kryo.c > > +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c > > @@ -86,8 +86,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) > > int ret; > > > > cpu_dev = get_cpu_device(0); > > - if (NULL == cpu_dev) > > - ret = -ENODEV; > > + if (!cpu_dev) > > + return -ENODEV; > > > > msm8996_version = qcom_cpufreq_kryo_get_msm_id(); > > if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { > > @@ -96,8 +96,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) > > } > > > > np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); > > - if (IS_ERR(np)) > > - return PTR_ERR(np); > > + if (!np) > > + return -ENOENT; > > > > ret = of_device_is_compatible(np, "operating-points-v2-kryo-cpu"); > > if (!ret) { > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > > Patch applied, thanks!
diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c index d049fe4b80c4..b54049614744 100644 --- a/drivers/cpufreq/qcom-cpufreq-kryo.c +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c @@ -86,8 +86,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) int ret; cpu_dev = get_cpu_device(0); - if (NULL == cpu_dev) - ret = -ENODEV; + if (!cpu_dev) + return -ENODEV; msm8996_version = qcom_cpufreq_kryo_get_msm_id(); if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { @@ -96,8 +96,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev) } np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); - if (IS_ERR(np)) - return PTR_ERR(np); + if (!np) + return -ENOENT; ret = of_device_is_compatible(np, "operating-points-v2-kryo-cpu"); if (!ret) {
We should return if get_cpu_device() fails or it leads to a NULL dereference. Also dev_pm_opp_of_get_opp_desc_node() returns NULL on error, it never returns error pointers. Fixes: 46e2856b8e18 ("cpufreq: Add Kryo CPU scaling driver") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>