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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,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 81587C433E0 for ; Tue, 23 Jun 2020 00:32:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E8F5207BC for ; Tue, 23 Jun 2020 00:32:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592872356; bh=Upgc+1fy6WFH3XNcBPCvqoAbvhOSY1dzH3U/SYaFv04=; h=Date:From:To:Cc:Subject:List-ID:From; b=QASjN9Tv+TvdBP4dEX+AtPy7oRAXGYETMljkeww620eAmL0lXlYb2OFAcbrC+scWW +Yst47C3cq0T36lh9qy1mUN8y/6T1auQp242EshAQO4mCRYQIKfI6Mkkpjm5OgQBoG 0UakacexY6xUt9RDoVBvErjCzxqzOV6fCPbhfeIE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731997AbgFWAcf (ORCPT ); Mon, 22 Jun 2020 20:32:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:57792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731487AbgFWAcd (ORCPT ); Mon, 22 Jun 2020 20:32:33 -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 CD1F92053B; Tue, 23 Jun 2020 00:32:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592872353; bh=Upgc+1fy6WFH3XNcBPCvqoAbvhOSY1dzH3U/SYaFv04=; h=Date:From:To:Cc:Subject:From; b=1n1lxV3OcLThhL8WtBPjr/PToUwi5lyitl08vDuv+e1LoNi9J0195yAj5Gf5ejRYd NecAdT8RxzHXY+jo9uWPg1chv5+TeIWmDkHrxE0LXCmlqRfM3vDs05oq275kVf1+Hv QXmD9lMJ394RNnlLyk/VjqAHpAwETqlcKPGHnzj0= Date: Mon, 22 Jun 2020 19:38:02 -0500 From: "Gustavo A. R. Silva" To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim Cc: linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH][next] perf cputopo: Use struct_size() helper Message-ID: <20200623003802.GA21572@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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. Signed-off-by: Gustavo A. R. Silva --- tools/perf/util/cputopo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/cputopo.c b/tools/perf/util/cputopo.c index 1b52402a8923..1d1b26e39f12 100644 --- a/tools/perf/util/cputopo.c +++ b/tools/perf/util/cputopo.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "cputopo.h" #include "cpumap.h" @@ -321,7 +322,7 @@ struct numa_topology *numa_topology__new(void) nr = (u32) node_map->nr; - tp = zalloc(sizeof(*tp) + sizeof(tp->nodes[0])*nr); + tp = zalloc(struct_size(tp, nodes, nr)); if (!tp) goto out; -- 2.27.0