From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88D09C433DF for ; Fri, 19 Jun 2020 23:03:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 64920224B8 for ; Fri, 19 Jun 2020 23:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592607786; bh=cdYHEQGb0tbwPgvd2pSEGoqkzQY6K9R5bsBpdMaNIo4=; h=Date:From:To:Cc:Subject:List-ID:From; b=hLtUmpUWxXN27zH0Wri+Qqp1n7wPDnViMvvzDqGbnDkvTrwo1FTgjk9gHg2mBKvKL 8EoiezBSZKGZQzOWtxdBCRpWPrLpeNhxmHzjcXsA3bdxKdCjkSXHX7K0R2vA+fZvOl oU4bSoKDemWcbtn7D/SbDY65yKHtFV9Tq+pZgQZ4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730173AbgFSXDF (ORCPT ); Fri, 19 Jun 2020 19:03:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:53914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729996AbgFSXDF (ORCPT ); Fri, 19 Jun 2020 19:03:05 -0400 Received: from embeddedor (unknown [189.207.59.248]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D378922403; Fri, 19 Jun 2020 23:03:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592607785; bh=cdYHEQGb0tbwPgvd2pSEGoqkzQY6K9R5bsBpdMaNIo4=; h=Date:From:To:Cc:Subject:From; b=CEGiLtkFlaDdzvrRc56GKEv39hmbXW/QU/MwrqMvM1CfQL/NAuGNA12sNXwJhv6MA z08fRif5tEl8fcUgodCC3HSph9zcFlifWAaCTmdNkBO8AWwnrOcmiU4Ot3Sxz0/aDd tyoIJp1hklHh/iaXuZRuqPTuCychYNerCpl8mcx8= Date: Fri, 19 Jun 2020 18:08:30 -0500 From: "Gustavo A. R. Silva" To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH][next] blk-iocost: Use struct_size() in kzalloc_node() Message-ID: <20200619230830.GA25608@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org 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 --- 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 8ac4aad66ebc..cea5ee9be639 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; -- 2.27.0