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=-10.1 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_GIT 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 AABE8C47409 for ; Fri, 14 Feb 2020 19:11:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 781962465D for ; Fri, 14 Feb 2020 19:11:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581707512; bh=WziOVSwWR4FoClBBJCxOlpUCWVSlY61qo9leXE8POe8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0uvj7s9FitXhnk65Uoam2wYud7Omly5Bh8JMjuCm1sS6j/9lGLwAQgRNJzPeNnm/G n/FQFHBPFNlJXY9lGG70oHe90EBr/IkCCmQdU7nD/pUZ3O0Vw6NaFz8FT4YyXBERNv kvSbc6PHq99250yYD09tA3OI9bOTBVj+WvQFbchE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388585AbgBNTLv (ORCPT ); Fri, 14 Feb 2020 14:11:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:49424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388461AbgBNTLq (ORCPT ); Fri, 14 Feb 2020 14:11:46 -0500 Received: from quaco.ghostprotocols.net (187-26-102-114.3g.claro.net.br [187.26.102.114]) (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 9A2EB2467D; Fri, 14 Feb 2020 19:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581707505; bh=WziOVSwWR4FoClBBJCxOlpUCWVSlY61qo9leXE8POe8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CdZf4x1pKTQViE8p1IhDskHpkmZx9TeUPlbmX4d/vnWxAMFdRiAWZ36KLCs4cxVIv nWrUOoXvDuRFmv1snDgZ1SfJ4KzeUl/z6uS2WcAxylmLylXCaDePB2Jy9+vkuchPrB XVrMOG7JhvJoznqeU5G8+ncj45xA1q1xmVq66O5Y= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ravi Bangoria , Kim Phillips , Alexander Shishkin , Michael Petlan , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 07/23] perf maps: Fix map__clone() for struct kmap Date: Fri, 14 Feb 2020 16:10:41 -0300 Message-Id: <20200214191057.26266-8-acme@kernel.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200214191057.26266-1-acme@kernel.org> References: <20200214191057.26266-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa The map__clone() function can be called on kernel maps as well, so it needs to duplicate the whole kmap data. Reported-by: Ravi Bangoria Signed-off-by: Jiri Olsa Tested-by: Ravi Bangoria Tested-by: Kim Phillips Cc: Alexander Shishkin Cc: Michael Petlan Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20200210143218.24948-4-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/map.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index f67960bedebb..cea05fc9595c 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -375,8 +375,13 @@ struct symbol *map__find_symbol_by_name(struct map *map, const char *name) struct map *map__clone(struct map *from) { - struct map *map = memdup(from, sizeof(*map)); + size_t size = sizeof(struct map); + struct map *map; + + if (from->dso && from->dso->kernel) + size += sizeof(struct kmap); + map = memdup(from, size); if (map != NULL) { refcount_set(&map->refcnt, 1); RB_CLEAR_NODE(&map->rb_node); -- 2.21.1