cpufreq: powernv: fix missing check of return value in init_powernv_pstates()
Subsystems (2)
PATCH 1/1 cpufreq: powernv: fix missing check of return value in init_powernv_pstates()
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.
--- drivers/cpufreq/powernv-cpufreq.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/cpufreq/powernv-cpufreq.c +7 -3
@@ -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. */
Signature · 1 line
2.17.0
Quoted 6 lines · 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.
Quoted 8 lines
WARNING: casting value returned by memory allocation function to (struct
pstate_idx_revmap_data*) is useless.Signed-off-by Yangtao Li <[email protected]>--- drivers/cpufreq/powernv-cpufreq.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Looks good to me. Thanks for fixing this.
Quoted 41 lines · 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 <[email protected]>--- drivers/cpufreq/powernv-cpufreq.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/cpufreq/powernv-cpufreq.c +6
-2@@ -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;
drivers/cpufreq/powernv-cpufreq.c static int init_powernv_pstates(void) · line 367
Quoted 8 lines
drivers/cpufreq/powernv-cpufreq.c +1
-1@@ -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.
Signature · 1 line
viresh