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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 04383C282CE for ; Mon, 11 Feb 2019 15:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BEF7621B18 for ; Mon, 11 Feb 2019 15:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549900653; bh=vmUBlkJyVkWZg1zec2jWCt0mFC3ocmcJM6Z2rV+x3SU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FYRXdjliQrQP+CGi42PfQ2/k8jL/cXrIDUt5S0Tl3l2hhp0Ns64gBL1odjuDOOhDK 32vejr/kZcbuOCVnLoqWsqwQJwJXvTjmNh4ddODxz+te1QmM+mX6l5o8WW9XtOn0BI 4LaGUx2TBjBDJhCTKqDHhCFPyKyRGNemTvB+1o5g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730671AbfBKOdg (ORCPT ); Mon, 11 Feb 2019 09:33:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:41404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730663AbfBKOdg (ORCPT ); Mon, 11 Feb 2019 09:33:36 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 6FF3520844; Mon, 11 Feb 2019 14:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895615; bh=vmUBlkJyVkWZg1zec2jWCt0mFC3ocmcJM6Z2rV+x3SU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vQiI1f7A8yy4v5m+PY8LZAKYq0iKPg0qHbInX4NwgiUq1MV/FmSxpP1m0SBflWV1k fZXA7/4G7UK4w0pLiOFKx559BzqRteNA160xiZTQpkflTkevfsp4pHSP1aoSKFyPg8 g9Gg+SImAaAg/bWQpTf+4z4PyT8RpFMRdG+wjWN4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Zyngier , Will Deacon , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 4.20 264/352] scripts/decode_stacktrace: only strip base path when a prefix of the path Date: Mon, 11 Feb 2019 15:18:11 +0100 Message-Id: <20190211141903.832797313@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 67a28de47faa83585dd644bd4c31e5a1d9346c50 ] Running something like: decodecode vmlinux . leads to interested results where not only the leading "." gets stripped from the displayed paths, but also anywhere in the string, displaying something like: kvm_vcpu_check_block (arch/arm64/kvm/virt/kvm/kvm_mainc:2141) which doesn't help further processing. Fix it by only stripping the base path if it is a prefix of the path. Link: http://lkml.kernel.org/r/20181210174659.31054-3-marc.zyngier@arm.com Signed-off-by: Marc Zyngier Cc: Will Deacon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- scripts/decode_stacktrace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh index 64220e36ce3b..98a7d63a723e 100755 --- a/scripts/decode_stacktrace.sh +++ b/scripts/decode_stacktrace.sh @@ -78,7 +78,7 @@ parse_symbol() { fi # Strip out the base of the path - code=${code//$basepath/""} + code=${code//^$basepath/""} # In the case of inlines, move everything to same line code=${code//$'\n'/' '} -- 2.19.1