On 5/17/19 2:26 AM, xiaolinkui wrote: > Use the new struct_size() helper to keep code simple. > This is not the reason why this helper was created. And if you are going to copy/paste changelog texts, at least try to understand and compile[1][2] the code before submitting it. -- Gustavo [1] https://lore.kernel.org/lkml/[email protected]/ [2] https://lore.kernel.org/lkml/[email protected]/ > Signed-off-by: xiaolinkui <[email protected]> > --- > lib/assoc_array.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/lib/assoc_array.c b/lib/assoc_array.c > index edc3c14..0e69b5b 100644 > --- a/lib/assoc_array.c > +++ b/lib/assoc_array.c > @@ -1494,8 +1494,7 @@ int assoc_array_gc(struct assoc_array *array, > shortcut = assoc_array_ptr_to_shortcut(cursor); > keylen = round_up(shortcut->skip_to_level, > ASSOC_ARRAY_KEY_CHUNK_SIZE); > keylen >>= ASSOC_ARRAY_KEY_CHUNK_SHIFT; > - new_s = kmalloc(sizeof(struct assoc_array_shortcut) + > - keylen * sizeof(unsigned long), GFP_KERNEL); > + new_s = kmalloc(struct_size(new_s, index_key, keylen), > GFP_KERNEL); > if (!new_s) > goto enomem; > pr_devel("dup shortcut %p -> %p\n", shortcut, new_s); >
