* [PATCH net-next] libceph, ceph: use struct_size() in kmalloc()
@ 2019-01-15 19:41 Gustavo A. R. Silva
2019-01-17 14:17 ` Ilya Dryomov
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo A. R. Silva @ 2019-01-15 19:41 UTC (permalink / raw)
To: Ilya Dryomov, Yan, Zheng, Sage Weil, David S. Miller
Cc: ceph-devel, netdev, 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 = kmalloc(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 = kmalloc(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>
---
net/ceph/osdmap.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 98c0ff3d6441..48a31dc9161c 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -495,9 +495,8 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
/ sizeof(struct crush_rule_step))
goto bad;
#endif
- r = c->rules[i] = kmalloc(sizeof(*r) +
- yes*sizeof(struct crush_rule_step),
- GFP_NOFS);
+ r = kmalloc(struct_size(r, steps, yes), GFP_NOFS);
+ c->rules[i] = r;
if (r == NULL)
goto badmem;
dout(" rule %d is at %p\n", i, r);
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] libceph, ceph: use struct_size() in kmalloc()
2019-01-15 19:41 [PATCH net-next] libceph, ceph: use struct_size() in kmalloc() Gustavo A. R. Silva
@ 2019-01-17 14:17 ` Ilya Dryomov
2019-01-25 3:50 ` Gustavo A. R. Silva
0 siblings, 1 reply; 3+ messages in thread
From: Ilya Dryomov @ 2019-01-17 14:17 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Yan, Zheng, Sage Weil, David S. Miller, Ceph Development, netdev,
linux-kernel
On Tue, Jan 15, 2019 at 8:41 PM Gustavo A. R. Silva
<gustavo@embeddedor.com> 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 = kmalloc(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 = kmalloc(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>
> ---
> net/ceph/osdmap.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
> index 98c0ff3d6441..48a31dc9161c 100644
> --- a/net/ceph/osdmap.c
> +++ b/net/ceph/osdmap.c
> @@ -495,9 +495,8 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
> / sizeof(struct crush_rule_step))
> goto bad;
> #endif
> - r = c->rules[i] = kmalloc(sizeof(*r) +
> - yes*sizeof(struct crush_rule_step),
> - GFP_NOFS);
> + r = kmalloc(struct_size(r, steps, yes), GFP_NOFS);
> + c->rules[i] = r;
> if (r == NULL)
> goto badmem;
> dout(" rule %d is at %p\n", i, r);
Applied.
Thanks,
Ilya
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] libceph, ceph: use struct_size() in kmalloc()
2019-01-17 14:17 ` Ilya Dryomov
@ 2019-01-25 3:50 ` Gustavo A. R. Silva
0 siblings, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2019-01-25 3:50 UTC (permalink / raw)
To: Ilya Dryomov
Cc: Yan, Zheng, Sage Weil, David S. Miller, Ceph Development, netdev,
linux-kernel
On 1/17/19 8:17 AM, Ilya Dryomov wrote:
> On Tue, Jan 15, 2019 at 8:41 PM Gustavo A. R. Silva
> <gustavo@embeddedor.com> 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 = kmalloc(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 = kmalloc(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>
>> ---
>> net/ceph/osdmap.c | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
>> index 98c0ff3d6441..48a31dc9161c 100644
>> --- a/net/ceph/osdmap.c
>> +++ b/net/ceph/osdmap.c
>> @@ -495,9 +495,8 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
>> / sizeof(struct crush_rule_step))
>> goto bad;
>> #endif
>> - r = c->rules[i] = kmalloc(sizeof(*r) +
>> - yes*sizeof(struct crush_rule_step),
>> - GFP_NOFS);
>> + r = kmalloc(struct_size(r, steps, yes), GFP_NOFS);
>> + c->rules[i] = r;
>> if (r == NULL)
>> goto badmem;
>> dout(" rule %d is at %p\n", i, r);
>
> Applied.
>
Thanks, Ilya.
--
Gustavo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-25 3:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-15 19:41 [PATCH net-next] libceph, ceph: use struct_size() in kmalloc() Gustavo A. R. Silva
2019-01-17 14:17 ` Ilya Dryomov
2019-01-25 3:50 ` Gustavo A. R. Silva
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.