Commit 1f4fe21c authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Jens Axboe

block: bio: Use struct_size() in kmalloc()

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.

This code was detected with the help of Coccinelle and, audited and
fixed manually.
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 85e0cbbb
...@@ -444,9 +444,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs, ...@@ -444,9 +444,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs,
if (nr_iovecs > UIO_MAXIOV) if (nr_iovecs > UIO_MAXIOV)
return NULL; return NULL;
p = kmalloc(sizeof(struct bio) + p = kmalloc(struct_size(bio, bi_inline_vecs, nr_iovecs), gfp_mask);
nr_iovecs * sizeof(struct bio_vec),
gfp_mask);
front_pad = 0; front_pad = 0;
inline_vecs = nr_iovecs; inline_vecs = nr_iovecs;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment