Skip to contentSkip to conversation

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

PATCH Applied Gustavo A. R. Silva 2 participants 2 messages Jun 20, 2020 Block layer

lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 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.

Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 block/bio.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
block/bio.c +1 -3
index a7366c02c9b5..fb5533416fa6 100644
@@ -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 {
Signature · 1 line
2.27.0
maintainer Applied
#1 lore raw
Quoted 5 lines · Gustavo A. R. Silva

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.

Applied, thanks.

Signature · 1 line
Jens Axboe