From: Gustavo A. R. Silva <gustavoars@kernel.org>
Date: Sat, 20 Jun 2020 00:49:49 +0000 (-0500)
Subject: block: bio: Use struct_size() in kmalloc()
X-Git-Tag: v5.9-rc1~147^2~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f4fe21cf45c799a2fef41ae23dd2a8a8dbb93b7;p=thirdparty%2Flinux.git

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: 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>
---

diff --git a/block/bio.c b/block/bio.c
index a7366c02c9b57..fb5533416fa67 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -444,9 +444,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 {