diff mbox series

[next] powercap/drivers/dtpm: Fix size of object being allocated

Message ID 20210104121053.33210-1-colin.king@canonical.com (mailing list archive)
State Mainlined, archived
Headers show
Series [next] powercap/drivers/dtpm: Fix size of object being allocated | expand

Commit Message

Colin King Jan. 4, 2021, 12:10 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

The kzalloc allocation for dtpm_cpu is currently allocating the size
of the pointer and not the size of the structure. Fix this by using
the correct sizeof argument.

Addresses-Coverity: ("Wrong sizeof argument")
Fixes: 0e8f68d7f048 ("powercap/drivers/dtpm: Add CPU energy model based support")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/powercap/dtpm_cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Lezcano Jan. 4, 2021, 2:23 p.m. UTC | #1
On 04/01/2021 13:10, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The kzalloc allocation for dtpm_cpu is currently allocating the size
> of the pointer and not the size of the structure. Fix this by using
> the correct sizeof argument.
> 
> Addresses-Coverity: ("Wrong sizeof argument")
> Fixes: 0e8f68d7f048 ("powercap/drivers/dtpm: Add CPU energy model based support")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Good catch, thanks for fixing this

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

> ---
>  drivers/powercap/dtpm_cpu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c
> index 6933c783c6b4..51c366938acd 100644
> --- a/drivers/powercap/dtpm_cpu.c
> +++ b/drivers/powercap/dtpm_cpu.c
> @@ -200,7 +200,7 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu)
>  	if (!dtpm)
>  		return -EINVAL;
>  
> -	dtpm_cpu = kzalloc(sizeof(dtpm_cpu), GFP_KERNEL);
> +	dtpm_cpu = kzalloc(sizeof(*dtpm_cpu), GFP_KERNEL);
>  	if (!dtpm_cpu)
>  		goto out_kfree_dtpm;
>  
>
Rafael J. Wysocki Jan. 7, 2021, 5:20 p.m. UTC | #2
On Mon, Jan 4, 2021 at 3:24 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>
> On 04/01/2021 13:10, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > The kzalloc allocation for dtpm_cpu is currently allocating the size
> > of the pointer and not the size of the structure. Fix this by using
> > the correct sizeof argument.
> >
> > Addresses-Coverity: ("Wrong sizeof argument")
> > Fixes: 0e8f68d7f048 ("powercap/drivers/dtpm: Add CPU energy model based support")
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
>
> Good catch, thanks for fixing this
>
> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

Applied as 5.12 material, thanks!

> > ---
> >  drivers/powercap/dtpm_cpu.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c
> > index 6933c783c6b4..51c366938acd 100644
> > --- a/drivers/powercap/dtpm_cpu.c
> > +++ b/drivers/powercap/dtpm_cpu.c
> > @@ -200,7 +200,7 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu)
> >       if (!dtpm)
> >               return -EINVAL;
> >
> > -     dtpm_cpu = kzalloc(sizeof(dtpm_cpu), GFP_KERNEL);
> > +     dtpm_cpu = kzalloc(sizeof(*dtpm_cpu), GFP_KERNEL);
> >       if (!dtpm_cpu)
> >               goto out_kfree_dtpm;
> >
> >
>
>
> --
> <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
diff mbox series

Patch

diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c
index 6933c783c6b4..51c366938acd 100644
--- a/drivers/powercap/dtpm_cpu.c
+++ b/drivers/powercap/dtpm_cpu.c
@@ -200,7 +200,7 @@  static int cpuhp_dtpm_cpu_online(unsigned int cpu)
 	if (!dtpm)
 		return -EINVAL;
 
-	dtpm_cpu = kzalloc(sizeof(dtpm_cpu), GFP_KERNEL);
+	dtpm_cpu = kzalloc(sizeof(*dtpm_cpu), GFP_KERNEL);
 	if (!dtpm_cpu)
 		goto out_kfree_dtpm;