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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 6C5FCC35671 for ; Sun, 23 Feb 2020 02:25:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0809B20659 for ; Sun, 23 Feb 2020 02:25:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VsYMLkno"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="vu1UD82T" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0809B20659 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PDOAHizL/kkBDUDI2fAEHOQu9u4DogOPMxVneBCYKDs=; b=VsYMLknoFWm/1a es3H16nuXmtWp2pynggpDdbxrHFfWXL2/vC74Hu1KmTCuwtznDDmwo/PsIUns1JPAh1q2Rg8Be0ru k0YJDtejprGe3x2b4mxXp8Y2iLYqqo0Jx/6frDfUER9auvoiu6EERqoZzyCQh+m0rRGGn+KoeOC7G lWNPE0n8MZahW+UgVmsdwDoww4i5TyexV/xxak/33cElcjGNI7WLF1Pjp8ZLlFrzcPuI54OMHmw+t lilnw4fXa67RDMQ3T0p8IWpBP7QPjilA/kr8y5aukv4tXwSYUy+T0H2dOzMpzj52y3VUhU+8A91uQ 8+DMevL9NLweRCp62Fgg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j5gxe-0005fq-OO; Sun, 23 Feb 2020 02:25:38 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j5gwR-0003TD-52 for linux-arm-kernel@lists.infradead.org; Sun, 23 Feb 2020 02:24:26 +0000 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 8F97324650; Sun, 23 Feb 2020 02:24:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582424662; bh=w7dB8T6smZtpdozM3mayPW1yOSMdu7lo1XVeSa7u92U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vu1UD82TUvtPYpuZciAx7LPR2IX8KNOHceBHoeDhaMGEZOzZtph3QM+Ui7tafts4z qlCqA/micijWOJno0fQj8+HDdm+hQbYjIg5OHRrxZSI5mgWZn0yNZmDLWs/XagW+5h y2jjQneqYIDa3XcCj6Nqttgw+PmRS+N04P1LWHSw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 08/21] arm/ftrace: Fix BE text poking Date: Sat, 22 Feb 2020 21:23:58 -0500 Message-Id: <20200223022411.2159-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200223022411.2159-1-sashal@kernel.org> References: <20200223022411.2159-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200222_182423_253822_A8B7CD6F X-CRM114-Status: GOOD ( 10.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Zijlstra , Sasha Levin , Dmitry Osipenko , Ingo Molnar , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peter Zijlstra [ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ] The __patch_text() function already applies __opcode_to_mem_*(), so when __opcode_to_mem_*() is not the identity (BE*), it is applied twice, wrecking the instruction. Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()") Reported-by: Dmitry Osipenko Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Dmitry Osipenko Signed-off-by: Sasha Levin --- arch/arm/kernel/ftrace.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index 5617932a83dfa..26b7321bb2152 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c @@ -106,13 +106,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, { unsigned long replaced; - if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { + if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) old = __opcode_to_mem_thumb32(old); - new = __opcode_to_mem_thumb32(new); - } else { + else old = __opcode_to_mem_arm(old); - new = __opcode_to_mem_arm(new); - } if (validate) { if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE)) -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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,URIBL_BLOCKED,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 B84A0C35671 for ; Sun, 23 Feb 2020 02:28:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8499120659 for ; Sun, 23 Feb 2020 02:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582424902; bh=w7dB8T6smZtpdozM3mayPW1yOSMdu7lo1XVeSa7u92U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KkQNCyyfmgHj1mYTIC2ys79y5L1py1jjDibcXfB/LFYvDILGW0W6orSa3HaLcaMtn pqdYAck8s+PLeevU5uxwu3G6ZImjfL8PiMWM9pBbN/YJD+O1+ud1ELe2e6Z4OFSEa6 ferhvJZMCq9hXfVL00sl+1PHcGJ1S8jqz4XC1JYI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729201AbgBWC2V (ORCPT ); Sat, 22 Feb 2020 21:28:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:54336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729187AbgBWCYW (ORCPT ); Sat, 22 Feb 2020 21:24:22 -0500 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 8F97324650; Sun, 23 Feb 2020 02:24:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582424662; bh=w7dB8T6smZtpdozM3mayPW1yOSMdu7lo1XVeSa7u92U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vu1UD82TUvtPYpuZciAx7LPR2IX8KNOHceBHoeDhaMGEZOzZtph3QM+Ui7tafts4z qlCqA/micijWOJno0fQj8+HDdm+hQbYjIg5OHRrxZSI5mgWZn0yNZmDLWs/XagW+5h y2jjQneqYIDa3XcCj6Nqttgw+PmRS+N04P1LWHSw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Zijlstra , Dmitry Osipenko , Ingo Molnar , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 08/21] arm/ftrace: Fix BE text poking Date: Sat, 22 Feb 2020 21:23:58 -0500 Message-Id: <20200223022411.2159-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200223022411.2159-1-sashal@kernel.org> References: <20200223022411.2159-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra [ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ] The __patch_text() function already applies __opcode_to_mem_*(), so when __opcode_to_mem_*() is not the identity (BE*), it is applied twice, wrecking the instruction. Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()") Reported-by: Dmitry Osipenko Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Dmitry Osipenko Signed-off-by: Sasha Levin --- arch/arm/kernel/ftrace.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index 5617932a83dfa..26b7321bb2152 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c @@ -106,13 +106,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, { unsigned long replaced; - if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { + if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) old = __opcode_to_mem_thumb32(old); - new = __opcode_to_mem_thumb32(new); - } else { + else old = __opcode_to_mem_arm(old); - new = __opcode_to_mem_arm(new); - } if (validate) { if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE)) -- 2.20.1