* [PATCH] cpufreq: powernv: fix missing check of return value in init_powernv_pstates()
@ 2019-02-16 17:06 Yangtao Li
2019-02-17 19:11 ` Akshay Adiga
2019-02-18 4:59 ` Viresh Kumar
0 siblings, 2 replies; 3+ messages in thread
From: Yangtao Li @ 2019-02-16 17:06 UTC (permalink / raw)
To: rjw, viresh.kumar, benh, paulus, mpe
Cc: linux-pm, linuxppc-dev, linux-kernel, Yangtao Li
kmalloc() could fail, so insert a check of its return value. And
if it fails, returns -ENOMEM.
And remove (struct pstate_idx_revmap_data *) to fix coccinelle WARNING
by the way.
WARNING: casting value returned by memory allocation function to (struct
pstate_idx_revmap_data *) is useless.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
drivers/cpufreq/powernv-cpufreq.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index 7e7ad3879c4e..d2230812fa4b 100644
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -244,6 +244,7 @@ static int init_powernv_pstates(void)
u32 len_ids, len_freqs;
u32 pstate_min, pstate_max, pstate_nominal;
u32 pstate_turbo, pstate_ultra_turbo;
+ int rc = -ENODEV;
power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");
if (!power_mgt) {
@@ -327,8 +328,11 @@ static int init_powernv_pstates(void)
powernv_freqs[i].frequency = freq * 1000; /* kHz */
powernv_freqs[i].driver_data = id & 0xFF;
- revmap_data = (struct pstate_idx_revmap_data *)
- kmalloc(sizeof(*revmap_data), GFP_KERNEL);
+ revmap_data = kmalloc(sizeof(*revmap_data), GFP_KERNEL);
+ if (!revmap_data) {
+ rc = -ENOMEM;
+ goto out;
+ }
revmap_data->pstate_id = id & 0xFF;
revmap_data->cpufreq_table_idx = i;
@@ -357,7 +361,7 @@ static int init_powernv_pstates(void)
return 0;
out:
of_node_put(power_mgt);
- return -ENODEV;
+ return rc;
}
/* Returns the CPU frequency corresponding to the pstate_id. */
--
2.17.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] cpufreq: powernv: fix missing check of return value in init_powernv_pstates()
2019-02-16 17:06 [PATCH] cpufreq: powernv: fix missing check of return value in init_powernv_pstates() Yangtao Li
@ 2019-02-17 19:11 ` Akshay Adiga
2019-02-18 4:59 ` Viresh Kumar
1 sibling, 0 replies; 3+ messages in thread
From: Akshay Adiga @ 2019-02-17 19:11 UTC (permalink / raw)
To: Yangtao Li
Cc: rjw, viresh.kumar, benh, paulus, mpe, linuxppc-dev, linux-kernel,
linux-pm
On Sat, Feb 16, 2019 at 12:06:23PM -0500, Yangtao Li wrote:
> kmalloc() could fail, so insert a check of its return value. And
> if it fails, returns -ENOMEM.
>
> And remove (struct pstate_idx_revmap_data *) to fix coccinelle WARNING
> by the way.
>
> WARNING: casting value returned by memory allocation function to (struct
> pstate_idx_revmap_data *) is useless.
>
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> ---
> drivers/cpufreq/powernv-cpufreq.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
Looks good to me. Thanks for fixing this.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cpufreq: powernv: fix missing check of return value in init_powernv_pstates()
2019-02-16 17:06 [PATCH] cpufreq: powernv: fix missing check of return value in init_powernv_pstates() Yangtao Li
2019-02-17 19:11 ` Akshay Adiga
@ 2019-02-18 4:59 ` Viresh Kumar
1 sibling, 0 replies; 3+ messages in thread
From: Viresh Kumar @ 2019-02-18 4:59 UTC (permalink / raw)
To: Yangtao Li; +Cc: rjw, benh, paulus, mpe, linux-pm, linuxppc-dev, linux-kernel
On 16-02-19, 12:06, Yangtao Li wrote:
> kmalloc() could fail, so insert a check of its return value. And
> if it fails, returns -ENOMEM.
>
> And remove (struct pstate_idx_revmap_data *) to fix coccinelle WARNING
> by the way.
>
> WARNING: casting value returned by memory allocation function to (struct
> pstate_idx_revmap_data *) is useless.
>
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> ---
> drivers/cpufreq/powernv-cpufreq.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
> index 7e7ad3879c4e..d2230812fa4b 100644
> --- a/drivers/cpufreq/powernv-cpufreq.c
> +++ b/drivers/cpufreq/powernv-cpufreq.c
> @@ -244,6 +244,7 @@ static int init_powernv_pstates(void)
> u32 len_ids, len_freqs;
> u32 pstate_min, pstate_max, pstate_nominal;
> u32 pstate_turbo, pstate_ultra_turbo;
> + int rc = -ENODEV;
>
> power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");
> if (!power_mgt) {
> @@ -327,8 +328,11 @@ static int init_powernv_pstates(void)
> powernv_freqs[i].frequency = freq * 1000; /* kHz */
> powernv_freqs[i].driver_data = id & 0xFF;
>
> - revmap_data = (struct pstate_idx_revmap_data *)
> - kmalloc(sizeof(*revmap_data), GFP_KERNEL);
> + revmap_data = kmalloc(sizeof(*revmap_data), GFP_KERNEL);
> + if (!revmap_data) {
> + rc = -ENOMEM;
> + goto out;
> + }
>
> revmap_data->pstate_id = id & 0xFF;
> revmap_data->cpufreq_table_idx = i;
> @@ -357,7 +361,7 @@ static int init_powernv_pstates(void)
> return 0;
> out:
> of_node_put(power_mgt);
> - return -ENODEV;
> + return rc;
> }
>
> /* Returns the CPU frequency corresponding to the pstate_id. */
Applied. Thanks.
--
viresh
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-18 4:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-16 17:06 [PATCH] cpufreq: powernv: fix missing check of return value in init_powernv_pstates() Yangtao Li
2019-02-17 19:11 ` Akshay Adiga
2019-02-18 4:59 ` Viresh Kumar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox