Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp847679pja; Wed, 1 Apr 2020 09:46:39 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu8RNUkl1dbZXFAiRGxNfatX+gO4B4Bn7gsodi4/e5QF6m1Ymvc1rgibQhWEeLE0WRrpFbu X-Received: by 2002:a9d:178a:: with SMTP id j10mr17138734otj.182.1585759599473; Wed, 01 Apr 2020 09:46:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759599; cv=none; d=google.com; s=arc-20160816; b=YpClwL/vIAG3dj0Plld/6mPa7TC21JFj4k/jOZBYwXsLGLvX0UB6qBAiOYDigS9cLJ TmmBiNyY9gVmFGKNoWkk5nw/nWCEKKMQqLOvaHZtu0tmZFrrKJhsE7B4L69pc45Jwtfk m/m37zFn8OkutkMe06rFMzFBPFCnx1kB/taO11ebzen0tERJNiz2NRTLBqvSajXbp8JJ VDaEcI4R8pSk0V1QGo/+wSR2Y0dhY4FvXd9oZmZA2fOdPMcsj/gFpe6s8Vhzb0CaTFtu qjMWJauyoEq5QnHYcU/FF0dwczERMLc5mVu/i1iy1pCFiyssc2xaaBlPbQZkiD2DaPgE qhCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8aNnlrcNyWr1i4Y+oDEd1MWi5H5Wx0+fwBgaELnenNw=; b=zQhqGPQkGa1yF9EBDDcyvtXCyhMYJZwn64tdV8CRSvfBzbOvc8dK13KpO9Lm0xlUf4 pVcZVWvl0Pee3rULuf8FvhgUHAaeCVx95i1AMcHH5O0tqkTbpyMVkdpx5BHxGZQI3iNJ gZLlZZXREztx3QpF57Xp4dX3qBZRTnu8kdAW5KdLJI9IvF3yd6RZDLN9ov+LanF9xMRY B9VkGAJWZIVu/9tBExwjthYdkJ05sF+M68Uq7e0AWXaVTU4X/3UIl9jlY3qRIUNfwGv7 bGoWc6IKf6kxYDbJDvurIvtgaftHZTM0KnuseYogTZDBfJfoCqnW/iEbKhfjWZ4xkBNR hphA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=b+RaT6P4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a1si951791oie.70.2020.04.01.09.46.26; Wed, 01 Apr 2020 09:46:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=b+RaT6P4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389756AbgDAQoj (ORCPT + 99 others); Wed, 1 Apr 2020 12:44:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:45710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388037AbgDAQoj (ORCPT ); Wed, 1 Apr 2020 12:44:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 845E520714; Wed, 1 Apr 2020 16:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759479; bh=PL47H3m46y2ou7/kunfoWvBHfO+TqmJQviVQ9Y3h6/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b+RaT6P4Maw2JuBINBYx+/h7EdpAsFywP6zX9nmqEqRePxuviVI1D/jXfX3W/h4lm l7ba7R1SczaGfGY1ChrZhcGhHrW4maoDtATHznjiSAk4OrLF0mxEm2ZM80KiluzADc HoI7mSBWtlQyBpekpA+qg2HVp5DBTTV2yUXFZc84= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexandre Ghiti , Masami Hiramatsu , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Peter Zijlstra , Sasha Levin , Arnaldo Carvalho de Melo Subject: [PATCH 4.14 093/148] perf probe: Do not depend on dwfl_module_addrsym() Date: Wed, 1 Apr 2020 18:18:05 +0200 Message-Id: <20200401161601.892799411@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu commit 1efde2754275dbd9d11c6e0132a4f09facf297ab upstream. Do not depend on dwfl_module_addrsym() because it can fail on user-space shared libraries. Actually, same bug was fixed by commit 664fee3dc379 ("perf probe: Do not use dwfl_module_addrsym if dwarf_diename finds symbol name"), but commit 07d369857808 ("perf probe: Fix wrong address verification) reverted to get actual symbol address from symtab. This fixes it again by getting symbol address from DIE, and only if the DIE has only address range, it uses dwfl_module_addrsym(). Fixes: 07d369857808 ("perf probe: Fix wrong address verification) Reported-by: Alexandre Ghiti Signed-off-by: Masami Hiramatsu Tested-by: Alexandre Ghiti Cc: Alexander Shishkin Cc: Greg Kroah-Hartman Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Sasha Levin Link: http://lore.kernel.org/lkml/158281812176.476.14164573830975116234.stgit@devnote2 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/probe-finder.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -626,14 +626,19 @@ static int convert_to_trace_point(Dwarf_ return -EINVAL; } - /* Try to get actual symbol name from symtab */ - symbol = dwfl_module_addrsym(mod, paddr, &sym, NULL); + if (dwarf_entrypc(sp_die, &eaddr) == 0) { + /* If the DIE has entrypc, use it. */ + symbol = dwarf_diename(sp_die); + } else { + /* Try to get actual symbol name and address from symtab */ + symbol = dwfl_module_addrsym(mod, paddr, &sym, NULL); + eaddr = sym.st_value; + } if (!symbol) { pr_warning("Failed to find symbol at 0x%lx\n", (unsigned long)paddr); return -ENOENT; } - eaddr = sym.st_value; tp->offset = (unsigned long)(paddr - eaddr); tp->address = (unsigned long)paddr;