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.1 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 F39C2C4360F for ; Mon, 18 Feb 2019 14:25:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C75F821903 for ; Mon, 18 Feb 2019 14:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499926; bh=NY8LO495SfcL0AZRL3NHNf2G2BR+waq9+arxqMPsLkw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UNFTKEYl3NBct6F3PN5Upo+33Q1lOZfPfH8Iu9Y2nPYlt1Zx4I1ldpnMX0MikGvc6 lCcK5M2n0m9AiwIK2OXH0K8TEG64Bl7tNXw9QBxnAqh4WdMgJ0sY+bwHOjJ48LxCoJ Nt02EXdQvcnLwJXVUldu3NzjCeG2RGWMLTw5pfNo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389926AbfBROZZ (ORCPT ); Mon, 18 Feb 2019 09:25:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:45532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388531AbfBRODe (ORCPT ); Mon, 18 Feb 2019 09:03:34 -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 8C45F21901; Mon, 18 Feb 2019 14:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498613; bh=NY8LO495SfcL0AZRL3NHNf2G2BR+waq9+arxqMPsLkw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sXZ3jRcnaTs33tft4mIdeBgZ0Q3TjVVo5RqI8CsbEZC5PZmPyWjgLO5rq6viM1DT0 fLHV2CBj1Pq/h8b+LsX3DhaagER1i4jIXdO6U803yriZvwQJtbkvYYSrMLnK5DDeGx tDH9pz+CqjzTx3NlUCjaOhDzWNg1+e4LdbtWulJ4= 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.4 064/143] scripts/decode_stacktrace: only strip base path when a prefix of the path Date: Mon, 18 Feb 2019 14:43:12 +0100 Message-Id: <20190218133531.439753203@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133529.099444112@linuxfoundation.org> References: <20190218133529.099444112@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-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 00d6d53c2681..ffc46c7c3afb 100755 --- a/scripts/decode_stacktrace.sh +++ b/scripts/decode_stacktrace.sh @@ -64,7 +64,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