mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Yang Yingliang <yangyingliang@huawei.com>
To: Viresh Kumar <viresh.kumar@linaro.org>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>
Cc: <linux-pm@vger.kernel.org>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	Caleb Connolly <caleb.connolly@linaro.org>,
	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH V4 1/3] thermal: core: call put_device() only after device_register() fails
Date: Thu, 19 Jan 2023 16:13:12 +0800	[thread overview]
Message-ID: <d7c05b81-3299-9ebe-b27d-06549290e3a1@huawei.com> (raw)
In-Reply-To: <d6e5d4fcca5f66d290e907d10c45cb2e7bbb09e5.1674030722.git.viresh.kumar@linaro.org>


On 2023/1/18 16:38, Viresh Kumar wrote:
> put_device() shouldn't be called before a prior call to
> device_register(). __thermal_cooling_device_register() doesn't follow
> that properly and needs fixing. Also
> thermal_cooling_device_destroy_sysfs() is getting called unnecessarily
> on few error paths.
>
> Fix all this by placing the calls at the right place.
>
> Based on initial work done by Caleb Connolly.
>
> Fixes: 4748f9687caa ("thermal: core: fix some possible name leaks in error paths")
> Fixes: c408b3d1d9bb ("thermal: Validate new state in cur_state_store()")
> Reported-by: Caleb Connolly <caleb.connolly@linaro.org>
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> ---
Reviewed-by: Yang Yingliang <yangyingliang@huawei.com>
> For v6.2-rc.
>
> V3->V4:
> - The first three versions were sent by Caleb.
> - The new version fixes the current bugs, without looking to optimize the
>    code any further, which is done separately in the next two patches.
>
>   drivers/thermal/thermal_core.c | 13 ++++++++++---
>   1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index f17ab2316dbd..77bd47d976a2 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -909,15 +909,20 @@ __thermal_cooling_device_register(struct device_node *np,
>   	cdev->devdata = devdata;
>   
>   	ret = cdev->ops->get_max_state(cdev, &cdev->max_state);
> -	if (ret)
> -		goto out_kfree_type;
> +	if (ret) {
> +		kfree(cdev->type);
> +		goto out_ida_remove;
> +	}
>   
>   	thermal_cooling_device_setup_sysfs(cdev);
> +
>   	ret = dev_set_name(&cdev->device, "cooling_device%d", cdev->id);
>   	if (ret) {
> +		kfree(cdev->type);
>   		thermal_cooling_device_destroy_sysfs(cdev);
> -		goto out_kfree_type;
> +		goto out_ida_remove;
>   	}
> +
>   	ret = device_register(&cdev->device);
>   	if (ret)
>   		goto out_kfree_type;
> @@ -943,6 +948,8 @@ __thermal_cooling_device_register(struct device_node *np,
>   	thermal_cooling_device_destroy_sysfs(cdev);
>   	kfree(cdev->type);
>   	put_device(&cdev->device);
> +
> +	/* thermal_release() takes care of the rest */
>   	cdev = NULL;
>   out_ida_remove:
>   	ida_free(&thermal_cdev_ida, id);

  parent reply	other threads:[~2023-01-19  8:13 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-18  8:38 [PATCH 0/3] thermal: Fix/cleanup error paths in __thermal_cooling_device_register() Viresh Kumar
2023-01-18  8:38 ` [PATCH V4 1/3] thermal: core: call put_device() only after device_register() fails Viresh Kumar
2023-01-18 19:57   ` Frank Rowand
2023-01-18 19:58   ` Rafael J. Wysocki
2023-01-19  5:16     ` Viresh Kumar
2023-01-19 20:09       ` Rafael J. Wysocki
2023-01-24 19:26         ` Rafael J. Wysocki
2023-01-19  8:13   ` Yang Yingliang [this message]
2023-01-19 15:02   ` Caleb Connolly
2023-01-18  8:38 ` [PATCH 2/3] thermal: core: Move cdev cleanup to thermal_release() Viresh Kumar
2023-01-19  8:25   ` Yang Yingliang
2023-01-18  8:38 ` [PATCH 3/3] thermal: core: Use device_unregister() instead of device_del/put() Viresh Kumar
2023-01-19  8:25   ` Yang Yingliang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d7c05b81-3299-9ebe-b27d-06549290e3a1@huawei.com \
    --to=yangyingliang@huawei.com \
    --cc=amitk@kernel.org \
    --cc=caleb.connolly@linaro.org \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=rafael@kernel.org \
    --cc=rui.zhang@intel.com \
    --cc=vincent.guittot@linaro.org \
    --cc=viresh.kumar@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®