From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Wei Wang <wvw@google.com>
Cc: wei.vince.wang@gmail.com, Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Amit Kucheria <amit.kucheria@verdurent.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 1/3] thermal: prevent cooling device with no type to be registered
Date: Mon, 9 Dec 2019 20:36:57 +0100 [thread overview]
Message-ID: <92311e54-8ae8-d9a5-2597-f2b9b447cfb5@linaro.org> (raw)
In-Reply-To: <20191205071953.121511-2-wvw@google.com>
On 05/12/2019 08:19, Wei Wang wrote:
> commit 54fa38cc2eda ("thermal: core: prevent zones with no types to be
> registered") added logic to prevent thermal zone with empty type to be
> registered. Similarly, there are APIs that rely on cdev->type.
> This patch prevents cooling device without valid type to be registered.
>
> Signed-off-by: Wei Wang <wvw@google.com>
> ---
> drivers/thermal/thermal_core.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index d4481cc8958f..974e2d91c30b 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -954,12 +954,22 @@ __thermal_cooling_device_register(struct device_node *np,
> struct thermal_zone_device *pos = NULL;
> int result;
>
> - if (type && strlen(type) >= THERMAL_NAME_LENGTH)
> + if (!type || !type[0]) {
Why not use strlen(type) == 0 ?
> + pr_err("Error: No cooling device type defined\n");
> return ERR_PTR(-EINVAL);
> + }
> +
> + if (strlen(type) >= THERMAL_NAME_LENGTH) {
> + pr_err("Error: Cooling device name over %d chars: %s\n",
> + THERMAL_NAME_LENGTH, type);
> + return ERR_PTR(-EINVAL);
> + }
>
> if (!ops || !ops->get_max_state || !ops->get_cur_state ||
> - !ops->set_cur_state)
> + !ops->set_cur_state) {
> + pr_err("Error: Cooling device missing callbacks: %s\n", type);
> return ERR_PTR(-EINVAL);
> + }
>
> cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
> if (!cdev)
> @@ -972,7 +982,7 @@ __thermal_cooling_device_register(struct device_node *np,
> }
>
> cdev->id = result;
> - strlcpy(cdev->type, type ? : "", sizeof(cdev->type));
> + strlcpy(cdev->type, type, sizeof(cdev->type));
> mutex_init(&cdev->lock);
> INIT_LIST_HEAD(&cdev->thermal_instances);
> cdev->np = np;
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2019-12-09 19:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 7:19 [PATCH v3 0/3] thermal: introduce by-name softlink Wei Wang
2019-12-05 7:19 ` [PATCH v3 1/3] thermal: prevent cooling device with no type to be registered Wei Wang
2019-12-09 7:41 ` Amit Kucheria
2019-12-09 17:34 ` Wei Wang
2019-12-09 19:36 ` Daniel Lezcano [this message]
2019-12-09 21:13 ` Wei Wang
2019-12-05 7:19 ` [PATCH v3 2/3] thermal: improve error message in thermal zone registration Wei Wang
2019-12-09 7:41 ` Amit Kucheria
2019-12-05 7:19 ` [PATCH v3 3/3] thermal: create softlink by name for thermal_zone and cooling_device Wei Wang
2019-12-06 19:15 ` Matthias Kaehlcke
2019-12-09 7:42 ` Amit Kucheria
2019-12-10 14:36 ` [PATCH v3 0/3] thermal: introduce by-name softlink Daniel Lezcano
2019-12-10 20:01 ` Wei Wang
2019-12-10 20:54 ` Daniel Lezcano
2019-12-11 8:53 ` Greg Kroah-Hartman
2019-12-11 8:54 ` Greg Kroah-Hartman
2019-12-11 20:11 ` Wei Wang
2019-12-11 21:11 ` Daniel Lezcano
2019-12-11 22:19 ` Wei Wang
2019-12-15 16:34 ` Sandeep Patil
2019-12-16 17:37 ` Wei Wang
2019-12-12 7:34 ` Greg Kroah-Hartman
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=92311e54-8ae8-d9a5-2597-f2b9b447cfb5@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=amit.kucheria@verdurent.com \
--cc=edubezval@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=wei.vince.wang@gmail.com \
--cc=wvw@google.com \
/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;
as well as URLs for NNTP newsgroup(s).