lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 139/530] thermal: cpufreq_cooling: Check the policy first in cpufreq_cooling_register()
    Date
    From: Xuewen Yan <xuewen.yan@unisoc.com>

    [ Upstream commit cff895277c8558221ba180aefe26799dcb4eec86 ]

    Since the policy needs to be accessed first when obtaining cpu devices,
    first check whether the policy is legal before this.

    Fixes: 5130802ddbb1 ("thermal: cpu_cooling: Switch to QoS requests for freq limits")
    Signed-off-by: Xuewen Yan <xuewen.yan@unisoc.com>
    Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/thermal/cpufreq_cooling.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c
    index 43b1ae8a7789..12a60415af95 100644
    --- a/drivers/thermal/cpufreq_cooling.c
    +++ b/drivers/thermal/cpufreq_cooling.c
    @@ -525,17 +525,17 @@ __cpufreq_cooling_register(struct device_node *np,
    struct thermal_cooling_device_ops *cooling_ops;
    char *name;

    + if (IS_ERR_OR_NULL(policy)) {
    + pr_err("%s: cpufreq policy isn't valid: %p\n", __func__, policy);
    + return ERR_PTR(-EINVAL);
    + }
    +
    dev = get_cpu_device(policy->cpu);
    if (unlikely(!dev)) {
    pr_warn("No cpu device for cpu %d\n", policy->cpu);
    return ERR_PTR(-ENODEV);
    }

    - if (IS_ERR_OR_NULL(policy)) {
    - pr_err("%s: cpufreq policy isn't valid: %p\n", __func__, policy);
    - return ERR_PTR(-EINVAL);
    - }
    -
    i = cpufreq_table_count_valid_entries(policy);
    if (!i) {
    pr_debug("%s: CPUFreq table not found or has no valid entries\n",
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 22:26    [W:4.242 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site