From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Date: Fri, 19 Jun 2020 18:08:30 -0500
Subject: [PATCH] blk-iocost: Use struct_size() in kzalloc_node()
References: bsc#1175995,jsc#SLE-15608
Git-commit: f61d6e259c7ebb9a134dee5cd0b32c192d726984
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/blk-iocost.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index e2818f3e4a28..040802c30a5a 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -2019,8 +2019,7 @@ static struct blkg_policy_data *ioc_pd_alloc(gfp_t gfp, struct request_queue *q,
int levels = blkcg->css.cgroup->level + 1;
struct ioc_gq *iocg;
- iocg = kzalloc_node(sizeof(*iocg) + levels * sizeof(iocg->ancestors[0]),
- gfp, q->node);
+ iocg = kzalloc_node(struct_size(iocg, ancestors, levels), gfp, q->node);
if (!iocg)
return NULL;
--
2.16.4