linux-kernel - Re: [PATCH 01/12] cpufreq/amd-pstate: Remove the goto label in amd_pstate_update

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <08e884ce-ffa5-449d-958d-c18b8a35e353@amd.com>
Date: Wed, 5 Feb 2025 11:40:21 -0600
From: Mario Limonciello <mario.limonciello@....com>
To: Dhananjay Ugwekar <dhananjay.ugwekar@....com>
Cc: linux-kernel@...r.kernel.org, linux-pm@...r.kernel.org,
 gautham.shenoy@....com, rafael@...nel.org, viresh.kumar@...aro.org
Subject: Re: [PATCH 01/12] cpufreq/amd-pstate: Remove the goto label in
 amd_pstate_update_limits

On 2/5/2025 05:25, Dhananjay Ugwekar wrote:
> Scope based guard/cleanup macros should not be used together with goto
> labels. Hence, remove the goto label.
> 
> Fixes: 6c093d5a5b73 ("cpufreq/amd-pstate: convert mutex use to guard()")
> Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@....com>

Thanks.

Reviewed-by: Mario Limonciello <mario.limonciello@....com>

I'll queue this fix for 6.14-rc.

> ---
>   drivers/cpufreq/amd-pstate.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 7120f035c0be..b163c1699821 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -838,8 +838,10 @@ static void amd_pstate_update_limits(unsigned int cpu)
>   	guard(mutex)(&amd_pstate_driver_lock);
>   
>   	ret = amd_get_highest_perf(cpu, &cur_high);
> -	if (ret)
> -		goto free_cpufreq_put;
> +	if (ret) {
> +		cpufreq_cpu_put(policy);
> +		return;
> +	}
>   
>   	prev_high = READ_ONCE(cpudata->prefcore_ranking);
>   	highest_perf_changed = (prev_high != cur_high);
> @@ -849,8 +851,6 @@ static void amd_pstate_update_limits(unsigned int cpu)
>   		if (cur_high < CPPC_MAX_PERF)
>   			sched_set_itmt_core_prio((int)cur_high, cpu);
>   	}
> -
> -free_cpufreq_put:
>   	cpufreq_cpu_put(policy);
>   
>   	if (!highest_perf_changed)