From: Gustavo A. R. Silva Date: Fri, 19 Jun 2020 23:08:30 +0000 (-0500) Subject: blk-iocost: Use struct_size() in kzalloc_node() X-Git-Tag: v5.9-rc1~147^2~111 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f61d6e259c7ebb9a134dee5cd0b32c192d726984;p=thirdparty%2Fkernel%2Flinux.git blk-iocost: Use struct_size() in kzalloc_node() 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 Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83 Signed-off-by: Jens Axboe --- diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 8ac4aad66ebc3..cea5ee9be6399 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -2045,8 +2045,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;