Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: [PATCH] thermal/of: Fix memory leak in thermal_of_zone_register()
From:   xiujianfeng <xiujianfeng@huawei.com>
To:     <rafael@kernel.org>, <daniel.lezcano@linaro.org>,
        <amitk@kernel.org>, <rui.zhang@intel.com>
CC:     <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>
References: <20221123143325.183870-1-xiujianfeng@huawei.com>
Message-ID: <1c39e64f-6691-eb58-fcad-59f16ac2e6ec@huawei.com>
Date:   Wed, 23 Nov 2022 22:48:33 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.9.1
MIME-Version: 1.0
In-Reply-To: <20221123143325.183870-1-xiujianfeng@huawei.com>
Content-Type: text/plain; charset="gbk"; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

sorry, it seems someone already sent fix patch, ignore this.

?? 2022/11/23 22:33, Xiu Jianfeng д??:
> In the entry of this function, it has allocated memory by kmemdup() and
> save it in @of_ops, it should be freed on the error paths, otherwise
> memory leak issue happens, fix it.
> 
> Fixes: 3fd6d6e2b4e8 ("thermal/of: Rework the thermal device tree initialization")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
>   drivers/thermal/thermal_of.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
> index d4b6335ace15..95d3da9051c4 100644
> --- a/drivers/thermal/thermal_of.c
> +++ b/drivers/thermal/thermal_of.c
> @@ -604,13 +604,15 @@ struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor,
>   	if (IS_ERR(np)) {
>   		if (PTR_ERR(np) != -ENODEV)
>   			pr_err("Failed to find thermal zone for %pOFn id=%d\n", sensor, id);
> -		return ERR_CAST(np);
> +		ret = PTR_ERR(np);
> +		goto out_kfree_ops;
>   	}
>   
>   	trips = thermal_of_trips_init(np, &ntrips);
>   	if (IS_ERR(trips)) {
>   		pr_err("Failed to find trip points for %pOFn id=%d\n", sensor, id);
> -		return ERR_CAST(trips);
> +		ret = PTR_ERR(trips);
> +		goto out_kfree_ops;
>   	}
>   
>   	ret = thermal_of_monitor_init(np, &delay, &pdelay);
> @@ -659,6 +661,8 @@ struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor,
>   	kfree(tzp);
>   out_kfree_trips:
>   	kfree(trips);
> +out_kfree_ops:
> +	kfree(of_ops);
>   
>   	return ERR_PTR(ret);
>   }
>