* [PATCH] ima: use struct_size() in kzalloc()
@ 2019-05-29 16:53 Gustavo A. R. Silva
2019-08-28 18:29 ` Gustavo A. R. Silva
0 siblings, 1 reply; 6+ messages in thread
From: Gustavo A. R. Silva @ 2019-05-29 16:53 UTC (permalink / raw)
To: Mimi Zohar, Dmitry Kasatkin, James Morris, Serge E. Hallyn
Cc: linux-integrity, linux-security-module, linux-kernel,
Gustavo A. R. Silva
One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:
struct foo {
int stuff;
struct boo entry[];
};
instance = kzalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:
instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
This code was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
security/integrity/ima/ima_template.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
index b631b8bc7624..b945dff2ed14 100644
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
@@ -281,9 +281,8 @@ static int ima_restore_template_data(struct ima_template_desc *template_desc,
int ret = 0;
int i;
- *entry = kzalloc(sizeof(**entry) +
- template_desc->num_fields * sizeof(struct ima_field_data),
- GFP_NOFS);
+ *entry = kzalloc(struct_size(*entry, template_data,
+ template_desc->num_fields), GFP_NOFS);
if (!*entry)
return -ENOMEM;
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ima: use struct_size() in kzalloc()
2019-05-29 16:53 [PATCH] ima: use struct_size() in kzalloc() Gustavo A. R. Silva
@ 2019-08-28 18:29 ` Gustavo A. R. Silva
2019-08-28 18:46 ` Mimi Zohar
2019-08-29 3:45 ` Mimi Zohar
0 siblings, 2 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2019-08-28 18:29 UTC (permalink / raw)
To: Mimi Zohar, Dmitry Kasatkin, James Morris, Serge E. Hallyn
Cc: linux-integrity, linux-security-module, linux-kernel
Hi all,
Friendly ping:
Who can take this, please?
Thanks
--
Gustavo
On 5/29/19 11:53 AM, Gustavo A. R. Silva wrote:
> One of the more common cases of allocation size calculations is finding
> the size of a structure that has a zero-sized array at the end, along
> with memory for some number of elements for that array. For example:
>
> struct foo {
> int stuff;
> struct boo entry[];
> };
>
> instance = kzalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL);
>
> Instead of leaving these open-coded and prone to type mistakes, we can
> now use the new struct_size() helper:
>
> instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
>
> This code was detected with the help of Coccinelle.
>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
> security/integrity/ima/ima_template.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
> index b631b8bc7624..b945dff2ed14 100644
> --- a/security/integrity/ima/ima_template.c
> +++ b/security/integrity/ima/ima_template.c
> @@ -281,9 +281,8 @@ static int ima_restore_template_data(struct ima_template_desc *template_desc,
> int ret = 0;
> int i;
>
> - *entry = kzalloc(sizeof(**entry) +
> - template_desc->num_fields * sizeof(struct ima_field_data),
> - GFP_NOFS);
> + *entry = kzalloc(struct_size(*entry, template_data,
> + template_desc->num_fields), GFP_NOFS);
> if (!*entry)
> return -ENOMEM;
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ima: use struct_size() in kzalloc()
2019-08-28 18:29 ` Gustavo A. R. Silva
@ 2019-08-28 18:46 ` Mimi Zohar
2019-08-28 18:51 ` Gustavo A. R. Silva
2019-08-29 3:45 ` Mimi Zohar
1 sibling, 1 reply; 6+ messages in thread
From: Mimi Zohar @ 2019-08-28 18:46 UTC (permalink / raw)
To: Gustavo A. R. Silva, Dmitry Kasatkin, James Morris, Serge E. Hallyn
Cc: linux-integrity, linux-security-module, linux-kernel
On Wed, 2019-08-28 at 13:29 -0500, Gustavo A. R. Silva wrote:
> Hi all,
>
> Friendly ping:
>
> Who can take this, please?
Thank you for the reminder. I'm just getting back from LSS and a very
short vacation. I'll look at it shortly.
Mimi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ima: use struct_size() in kzalloc()
2019-08-28 18:46 ` Mimi Zohar
@ 2019-08-28 18:51 ` Gustavo A. R. Silva
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2019-08-28 18:51 UTC (permalink / raw)
To: Mimi Zohar, Dmitry Kasatkin, James Morris, Serge E. Hallyn
Cc: linux-integrity, linux-security-module, linux-kernel
On 8/28/19 1:46 PM, Mimi Zohar wrote:
> On Wed, 2019-08-28 at 13:29 -0500, Gustavo A. R. Silva wrote:
>> Hi all,
>>
>> Friendly ping:
>>
>> Who can take this, please?
>
> Thank you for the reminder. I'm just getting back from LSS and a very
> short vacation. I'll look at it shortly.
>
Thanks, Mimi.
--
Gustavo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ima: use struct_size() in kzalloc()
2019-08-28 18:29 ` Gustavo A. R. Silva
2019-08-28 18:46 ` Mimi Zohar
@ 2019-08-29 3:45 ` Mimi Zohar
2019-08-29 17:16 ` Gustavo A. R. Silva
1 sibling, 1 reply; 6+ messages in thread
From: Mimi Zohar @ 2019-08-29 3:45 UTC (permalink / raw)
To: Gustavo A. R. Silva, Dmitry Kasatkin, James Morris, Serge E. Hallyn
Cc: linux-integrity, linux-security-module, linux-kernel
Hi Gustavo,
On Wed, 2019-08-28 at 13:29 -0500, Gustavo A. R. Silva wrote:
> On 5/29/19 11:53 AM, Gustavo A. R. Silva wrote:
> > One of the more common cases of allocation size calculations is finding
> > the size of a structure that has a zero-sized array at the end, along
> > with memory for some number of elements for that array. For example:
> >
> > struct foo {
> > int stuff;
> > struct boo entry[];
> > };
> >
> > instance = kzalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL);
> >
> > Instead of leaving these open-coded and prone to type mistakes, we can
> > now use the new struct_size() helper:
> >
> > instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
> >
> > This code was detected with the help of Coccinelle.
> >
> > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> > ---
> > security/integrity/ima/ima_template.c | 5 ++---
> > 1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
> > index b631b8bc7624..b945dff2ed14 100644
> > --- a/security/integrity/ima/ima_template.c
> > +++ b/security/integrity/ima/ima_template.c
> > @@ -281,9 +281,8 @@ static int ima_restore_template_data(struct ima_template_desc *template_desc,
> > int ret = 0;
> > int i;
> >
> > - *entry = kzalloc(sizeof(**entry) +
> > - template_desc->num_fields * sizeof(struct ima_field_data),
> > - GFP_NOFS);
> > + *entry = kzalloc(struct_size(*entry, template_data,
> > + template_desc->num_fields), GFP_NOFS);
> > if (!*entry)
> > return -ENOMEM;
> >
> >
The same usage exists in ima_api.c: ima_alloc_init_template(). Did
you want to make the change there as well?
thanks,
Mimi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ima: use struct_size() in kzalloc()
2019-08-29 3:45 ` Mimi Zohar
@ 2019-08-29 17:16 ` Gustavo A. R. Silva
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2019-08-29 17:16 UTC (permalink / raw)
To: Mimi Zohar, Dmitry Kasatkin, James Morris, Serge E. Hallyn
Cc: linux-integrity, linux-security-module, linux-kernel
Hi Mimi,
On 8/28/19 10:45 PM, Mimi Zohar wrote:
>
> The same usage exists in ima_api.c: ima_alloc_init_template(). Did
> you want to make the change there as well?
>
Yep. I'll write a patch for that one too.
Thanks
--
Gustavo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-08-29 17:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-29 16:53 [PATCH] ima: use struct_size() in kzalloc() Gustavo A. R. Silva
2019-08-28 18:29 ` Gustavo A. R. Silva
2019-08-28 18:46 ` Mimi Zohar
2019-08-28 18:51 ` Gustavo A. R. Silva
2019-08-29 3:45 ` Mimi Zohar
2019-08-29 17:16 ` Gustavo A. R. Silva
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).