From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Date: Fri, 19 Jun 2020 19:49:49 -0500
Subject: [PATCH] block: bio: Use struct_size() in kmalloc()
References: bsc#1175995,jsc#SLE-15608
Git-commit: 1f4fe21cf45c799a2fef41ae23dd2a8a8dbb93b7
Patch-mainline: v5.9-rc1
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: Gustavo A. R. Silva <gustavoars@kernel.org>
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
block/bio.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/block/bio.c b/block/bio.c
index c3d22cb20a5f..482bf6fc54d4 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -441,9 +441,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, unsigned int nr_iovecs,
if (nr_iovecs > UIO_MAXIOV)
return NULL;
- p = kmalloc(sizeof(struct bio) +
- nr_iovecs * sizeof(struct bio_vec),
- gfp_mask);
+ p = kmalloc(struct_size(bio, bi_inline_vecs, nr_iovecs), gfp_mask);
front_pad = 0;
inline_vecs = nr_iovecs;
} else {
--
2.16.4