2018-06-14 20:32:33

by Ilia Lin

Subject: [PATCH] cpufreq: kryo: Fix possible error code dereference

From: Ilia Lin <[email protected]>

In event of error returned by the nvmem_cell_read() non-pointer value
may be dereferenced. Fix this with error handling.

Signed-off-by: Ilia Lin <[email protected]>
---
drivers/cpufreq/qcom-cpufreq-kryo.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index d049fe4b80c4..5e9511223ce9 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -115,6 +115,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)

speedbin = nvmem_cell_read(speedbin_nvmem, &len);
nvmem_cell_put(speedbin_nvmem);
+ if (IS_ERR(speedbin))
+ return PTR_ERR(speedbin);

switch (msm8996_version) {
case MSM8996_V3:
--
2.11.0

2018-06-15 02:48:08

by Viresh Kumar

Subject: Re: [PATCH] cpufreq: kryo: Fix possible error code dereference

On 14-06-18, 22:29, [email protected] wrote:
> From: Ilia Lin <[email protected]>
>
> In event of error returned by the nvmem_cell_read() non-pointer value
> may be dereferenced. Fix this with error handling.
>
> Signed-off-by: Ilia Lin <[email protected]>

Fixes tag ?

> ---
> drivers/cpufreq/qcom-cpufreq-kryo.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
> index d049fe4b80c4..5e9511223ce9 100644
> --- a/drivers/cpufreq/qcom-cpufreq-kryo.c
> +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
> @@ -115,6 +115,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
>
> speedbin = nvmem_cell_read(speedbin_nvmem, &len);
> nvmem_cell_put(speedbin_nvmem);
> + if (IS_ERR(speedbin))
> + return PTR_ERR(speedbin);
>
> switch (msm8996_version) {
> case MSM8996_V3:
> --
> 2.11.0

--
viresh

2018-06-17 20:00:18

by Ilia Lin

Subject: [PATCH v2] cpufreq: kryo: Fix possible error code dereference

From: Ilia Lin <[email protected]>

In event of error returned by the nvmem_cell_read() non-pointer value
may be dereferenced. Fix this with error handling.
Additionally free the allocated speedbin buffer, as per the API.

Fixes: 9ce36edd1a52 (cpufreq: Add Kryo CPU scaling driver)
Signed-off-by: Ilia Lin <[email protected]>
---
drivers/cpufreq/qcom-cpufreq-kryo.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index d049fe4b80c4..74b9b93d511b 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -115,6 +115,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)

speedbin = nvmem_cell_read(speedbin_nvmem, &len);
nvmem_cell_put(speedbin_nvmem);
+ if (IS_ERR(speedbin))
+ return PTR_ERR(speedbin);

switch (msm8996_version) {
case MSM8996_V3:
@@ -127,6 +129,7 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
BUG();
break;
}
+ kfree(speedbin);

for_each_possible_cpu(cpu) {
cpu_dev = get_cpu_device(cpu);
--
2.11.0

2018-06-18 04:57:32

by Viresh Kumar

Subject: Re: [PATCH v2] cpufreq: kryo: Fix possible error code dereference

On 17-06-18, 21:58, [email protected] wrote:
> From: Ilia Lin <[email protected]>
>
> In event of error returned by the nvmem_cell_read() non-pointer value
> may be dereferenced. Fix this with error handling.
> Additionally free the allocated speedbin buffer, as per the API.
>
> Fixes: 9ce36edd1a52 (cpufreq: Add Kryo CPU scaling driver)
> Signed-off-by: Ilia Lin <[email protected]>
> ---
> drivers/cpufreq/qcom-cpufreq-kryo.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
> index d049fe4b80c4..74b9b93d511b 100644
> --- a/drivers/cpufreq/qcom-cpufreq-kryo.c
> +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
> @@ -115,6 +115,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
>
> speedbin = nvmem_cell_read(speedbin_nvmem, &len);
> nvmem_cell_put(speedbin_nvmem);
> + if (IS_ERR(speedbin))
> + return PTR_ERR(speedbin);
>
> switch (msm8996_version) {
> case MSM8996_V3:
> @@ -127,6 +129,7 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
> BUG();
> break;
> }
> + kfree(speedbin);
>
> for_each_possible_cpu(cpu) {
> cpu_dev = get_cpu_device(cpu);

Ideally this should have been two patches as you were fixing two
different problems. But anyway, you can go through this time.

Acked-by: Viresh Kumar <[email protected]>

--
viresh

2018-06-21 13:25:42

by Rafael J. Wysocki

Subject: Re: [PATCH v2] cpufreq: kryo: Fix possible error code dereference

On Monday, June 18, 2018 6:55:23 AM CEST Viresh Kumar wrote:
> On 17-06-18, 21:58, [email protected] wrote:
> > From: Ilia Lin <[email protected]>
> >
> > In event of error returned by the nvmem_cell_read() non-pointer value
> > may be dereferenced. Fix this with error handling.
> > Additionally free the allocated speedbin buffer, as per the API.
> >
> > Fixes: 9ce36edd1a52 (cpufreq: Add Kryo CPU scaling driver)
> > Signed-off-by: Ilia Lin <[email protected]>
> > ---
> > drivers/cpufreq/qcom-cpufreq-kryo.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
> > index d049fe4b80c4..74b9b93d511b 100644
> > --- a/drivers/cpufreq/qcom-cpufreq-kryo.c
> > +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
> > @@ -115,6 +115,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
> >
> > speedbin = nvmem_cell_read(speedbin_nvmem, &len);
> > nvmem_cell_put(speedbin_nvmem);
> > + if (IS_ERR(speedbin))
> > + return PTR_ERR(speedbin);
> >
> > switch (msm8996_version) {
> > case MSM8996_V3:
> > @@ -127,6 +129,7 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
> > BUG();
> > break;
> > }
> > + kfree(speedbin);
> >
> > for_each_possible_cpu(cpu) {
> > cpu_dev = get_cpu_device(cpu);
>
> Ideally this should have been two patches as you were fixing two
> different problems. But anyway, you can go through this time.
>
> Acked-by: Viresh Kumar <[email protected]>

Patch applied, thanks!