From patchwork Tue Mar 3 17:43:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229949 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 E0D54C3F2D7 for ; Tue, 3 Mar 2020 18:04:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA93420836 for ; Tue, 3 Mar 2020 18:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258698; bh=LkB/ld1v7E5olWXI7Cv6NehVA818PbkX17uUoHk2kUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2iZqsigEAe6mki/Eik1ZNH5cZjggedy0xBkczF8C2vbBe7JjQHmGnNudx0vc4gWMa E2fYWc7UN0PqeYXT8DfhCsk6LWq+KZ5nvipXbILHvKmZLAbhn8t1KqLJ0HFVEVSwOE sdKBO0qxwgTpSbBElDQkYZHYuF3KVhB4fzfUJ6VI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733015AbgCCSE6 (ORCPT ); Tue, 3 Mar 2020 13:04:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:42004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387502AbgCCR67 (ORCPT ); Tue, 3 Mar 2020 12:58:59 -0500 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 C01E02146E; Tue, 3 Mar 2020 17:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258339; bh=LkB/ld1v7E5olWXI7Cv6NehVA818PbkX17uUoHk2kUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QRRSNPn3n533Nz2dI9NgXpAOHaE0eHboS1URzX5W8utRsF9onX3CMiJYyphJwFgdm RfgTXrdXNvZyXIGnvbSbh47kHA+FbjnEWKMVELcEVsvIMJTNaZHiajW2N8Kou3BXkK ryTK49My4m7qlSr/SoeYYRMziBw8GsrcqAfrsGHo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Osipenko , "Peter Zijlstra (Intel)" , Ingo Molnar , Sasha Levin Subject: [PATCH 4.19 12/87] arm/ftrace: Fix BE text poking Date: Tue, 3 Mar 2020 18:43:03 +0100 Message-Id: <20200303174350.172336594@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174349.075101355@linuxfoundation.org> References: <20200303174349.075101355@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 ee673c09aa6c0..dd0215fb6fe23 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))