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 3E640C433E3 for ; Thu, 14 May 2020 19:00:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 16D09206A5 for ; Thu, 14 May 2020 19:00:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482827; bh=1/cZnEmvNwyQx0PP6YrXvlDaZXhKlu0hVBBjbZk+f+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wtaFmIJS3nV3Iu/8d0rs3V9bc46zlXCF5HckqAxsxsTttYO5Pe2aJ8o2I1A0JUvy/ iMCsq4p24EdS+Dx+Rgi35O4a1e0yCngPM37dp4r7+kWUvMmHjd85+szAJLlH8WdsMF zhpiFsrdx4XbXD77FKiPmigQvDo8uOjdDG/b7Tuk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727829AbgENTA0 (ORCPT ); Thu, 14 May 2020 15:00:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:56458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729489AbgENSzr (ORCPT ); Thu, 14 May 2020 14:55:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 157002074A; Thu, 14 May 2020 18:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482546; bh=1/cZnEmvNwyQx0PP6YrXvlDaZXhKlu0hVBBjbZk+f+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aZO7nvy1TL1duKh7Drtp0qC8oxwaiSPh3a1i7mxZN13Z8CVjzLOJn7PuAiNqlqtza 4tgMPio1tbigVX4erSuf7FOoLmGvZ2RENw9GNTicMQq+E50UqNDJ51fNEXlhBE6hzJ PMHnFVFjwfm7JuyGcO7EFf13c2J2SUdLqVd1t20c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ivan Delalande , Andrew Morton , Borislav Petkov , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.14 38/39] scripts/decodecode: fix trapping instruction formatting Date: Thu, 14 May 2020 14:54:55 -0400 Message-Id: <20200514185456.21060-38-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514185456.21060-1-sashal@kernel.org> References: <20200514185456.21060-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ivan Delalande [ Upstream commit e08df079b23e2e982df15aa340bfbaf50f297504 ] If the trapping instruction contains a ':', for a memory access through segment registers for example, the sed substitution will insert the '*' marker in the middle of the instruction instead of the line address: 2b: 65 48 0f c7 0f cmpxchg16b %gs:*(%rdi) <-- trapping instruction I started to think I had forgotten some quirk of the assembly syntax before noticing that it was actually coming from the script. Fix it to add the address marker at the right place for these instructions: 28: 49 8b 06 mov (%r14),%rax 2b:* 65 48 0f c7 0f cmpxchg16b %gs:(%rdi) <-- trapping instruction 30: 0f 94 c0 sete %al Fixes: 18ff44b189e2 ("scripts/decodecode: make faulting insn ptr more robust") Signed-off-by: Ivan Delalande Signed-off-by: Andrew Morton Reviewed-by: Borislav Petkov Link: http://lkml.kernel.org/r/20200419223653.GA31248@visor Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- scripts/decodecode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/decodecode b/scripts/decodecode index 438120da13610..1ab4ef613cb07 100755 --- a/scripts/decodecode +++ b/scripts/decodecode @@ -99,7 +99,7 @@ faultlinenum=$(( $(wc -l $T.oo | cut -d" " -f1) - \ faultline=`cat $T.dis | head -1 | cut -d":" -f2-` faultline=`echo "$faultline" | sed -e 's/\[/\\\[/g; s/\]/\\\]/g'` -cat $T.oo | sed -e "${faultlinenum}s/^\(.*:\)\(.*\)/\1\*\2\t\t<-- trapping instruction/" +cat $T.oo | sed -e "${faultlinenum}s/^\([^:]*:\)\(.*\)/\1\*\2\t\t<-- trapping instruction/" echo cat $T.aa cleanup -- 2.20.1