Commit e5a82249 authored by Mehdi Ben Hadj Khelifa's avatar Mehdi Ben Hadj Khelifa Committed by Jens Axboe
Browse files

blk-mq: use struct_size() in kmalloc() 



Change struct size calculation to use struct_size()
to align with new recommended practices[1] which quotes:
"Another common case to avoid is calculating the size of a structure with
a trailing array of others structures, as in:

header = kzalloc(sizeof(*header) + count * sizeof(*header->item),
                 GFP_KERNEL);

Instead, use the helper:

header = kzalloc(struct_size(header, item, count), GFP_KERNEL);"

Signed-off-by: default avatarMehdi Ben Hadj Khelifa <mehdi.benhadjkhelifa@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d60055cf

block/blk-mq-sched.c

+1 −2
Original line number Diff line number Diff line
@@ -466,8 +466,7 @@ struct elevator_tags *blk_mq_alloc_sched_tags(struct blk_mq_tag_set *set, 
	else

		nr_tags = nr_hw_queues;



	et = kmalloc(sizeof(struct elevator_tags) +

			nr_tags * sizeof(struct blk_mq_tags *), gfp);

	et = kmalloc(struct_size(et, tags, nr_tags), gfp);

	if (!et)

		return NULL;