[v3,1/3] thermal: prevent cooling device with no type to be registered
diff mbox series

Message ID 20191205071953.121511-2-wvw@google.com
State Accepted, archived
Delegated to: Zhang Rui
Headers show
Series
  • thermal: introduce by-name softlink
Related show

Commit Message

Wei Wang Dec. 5, 2019, 7:19 a.m. UTC
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(-)

Comments

Amit Kucheria Dec. 9, 2019, 7:41 a.m. UTC | #1
On Thu, Dec 5, 2019 at 12:50 PM Wei Wang <wvw@google.com> 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>

Looks better now. Thanks.

Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Tested-by: Amit Kucheria <amit.kucheria@linaro.org>

> ---
>  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]) {
> +               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;
> --
> 2.24.0.393.g34dc348eaf-goog
>
Wei Wang Dec. 9, 2019, 5:34 p.m. UTC | #2
On Sun, Dec 8, 2019 at 11:41 PM Amit Kucheria
<amit.kucheria@verdurent.com> wrote:
>
> On Thu, Dec 5, 2019 at 12:50 PM Wei Wang <wvw@google.com> 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>
>
> Looks better now. Thanks.
>

Thanks Amit for the review and testing.

> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
> Tested-by: Amit Kucheria <amit.kucheria@linaro.org>
>
> > ---
> >  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]) {
> > +               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;
> > --
> > 2.24.0.393.g34dc348eaf-goog
> >
Daniel Lezcano Dec. 9, 2019, 7:36 p.m. UTC | #3
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;
>
Wei Wang Dec. 9, 2019, 9:13 p.m. UTC | #4
On Mon, Dec 9, 2019 at 11:36 AM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> 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 ?

Checking empty is faster than getting length and this is already a
pattern used in this file:
https://github.com/torvalds/linux/blob/v5.4/drivers/thermal/thermal_core.c#L63



>
> > +             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
>

Patch
diff mbox series

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]) {
+		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;