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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 39A3EC433F5 for ; Thu, 3 Feb 2022 08:23:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FgynRlfO7rloU2cnbrUQppYb0IprKr/B5Qr8M6h8ZNc=; b=Jen9dZCUrbEs0F L0/dCWAAHdUKSFLqFZuCSY4CBii9l0freX8lzWrci/nh8TH/fT17xSnm4y+BLMynwEYjWeiXAKskC VMaxyE9uss0rVfkwGk8lA9y9WhicnJzV4Rcvw4cOOcspJ7xA0m1f7UJtvbh7tY9Niv0e3Bnm+monu QmlIYD+Kfz/qXaeCHjzlOCMiqVdzPgAybvlXqs31WrUn49dz9OzGgNFtZcdrzN0K6xZtbYLFq/mjC YfBI9OnXsX8wK2cw1+AWf09mZPaSUzei8s09VoNKozjgvHUgvfbG5k2TdeN7oKH8dc9MnvymAObSM dTKTVQ/NNf+PV/o9yQnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nFXO4-000JMN-6v; Thu, 03 Feb 2022 08:22:40 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nFXNh-000JF2-G2 for linux-arm-kernel@lists.infradead.org; Thu, 03 Feb 2022 08:22:18 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EDF5F6181E; Thu, 3 Feb 2022 08:22:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C34DC340ED; Thu, 3 Feb 2022 08:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643876536; bh=wFkfkvXKaDAbX4gN+SodcXjjh4CrTsWgz8LBkALlvm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SgLP4VL9Soy1yhQJyTNFr9WPnOceu3lk3TQRVGk41V5RRvhls+ovArbFQMtKMcWx4 V2sjKqXnsyLXr9xHZD/pKrjQjohIdbEtcKTL7al8WgdR0S64o0Qit3HMJV0sMFHMyg g9lf9XM6YtEzH4bBMpfuriNeUwg8tW0FtEuQ3lmUXrFXpqJSq+4z0YFd2lquanCTZA N+9QnCrzIci703oOnT5TQM/UY7M0oHf6EAR6KitVYal0A6qHF2X/5lqHKJVvH0f6yt RVneIYbEB4AdDrVewUowap5ZYLVnPSMcjWq1XCroExfaMaY/y7eg7ozKqNEvYMidBk u+k5Ieo1+3RBA== From: Ard Biesheuvel To: linux@armlinux.org.uk Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Steven Rostedt , Sudeep Holla , Cristian Marussi , Nathan Chancellor , Nick Desaulniers , Arnd Bergmann , Linus Walleij , Masami Hiramatsu Subject: [PATCH v3 01/13] ARM: ftrace: ensure that ADR takes the Thumb bit into account Date: Thu, 3 Feb 2022 09:21:52 +0100 Message-Id: <20220203082204.1176734-2-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220203082204.1176734-1-ardb@kernel.org> References: <20220203082204.1176734-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1004; h=from:subject; bh=wFkfkvXKaDAbX4gN+SodcXjjh4CrTsWgz8LBkALlvm0=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBh+5CUYyhjgQPjUsNaAWEXM/8jWh6HYyf/i7p0GB0x JXxzGK2JAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYfuQlAAKCRDDTyI5ktmPJAOHDA C31R2L2bMGMbmOBy+34BD94g8wcr3iWElVa/Cfy6vx7KJ6cVo+M9xnSdXBgiDWpiAc54Y/9AM0mlS7 gmWGmP3ya2ZBxWcNol6vEn8GxN0ai6Gb2b45jTuvdux2JyZ05YMfcyXSrrxvYo0B3sBf1I1Pyi3jfP I33tmH4k5KFPTxU3gsySzD7mFPvOF9rn1SbihkhA9LHjY6XWjLGLBcoHLq5Drdggn1rN3cLOlgS0ws e2YMhL1X3dUx7t7K4SkogeOLo2bhKOlkDQg4RLFmQJfMCtjOYT9O8UXjMoNXqDwIgPb2yChkDK/98h LfyJqrVAit0OAWe1E9x1r/0iNpPA4A4C7KIEUEt6YDA8SWgK6y3f3STxI6OP65ChQ92XOtghhxdY/i gDOb63zrq50jNJisq9cJkWvyhf4FzGaDCY1ZauVvwMxlWVg7cE5WPbw0m/wHh+SCqg9Yvr3SnIEmQ+ EGCNjjQFpxCENcDA60cvaHMbLRrJ9hwP8u6FzwynZVBUI= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220203_002217_611574_E198D98F X-CRM114-Status: GOOD ( 13.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Using ADR to take the address of 'ftrace_stub' via a local label produces an address that has the Thumb bit cleared, which means the subsequent comparison is guaranteed to fail. Instead, use the badr macro, which forces the Thumb bit to be set. Fixes: a3ba87a61499 ("ARM: 6316/1: ftrace: add Thumb-2 support") Signed-off-by: Ard Biesheuvel Reviewed-by: Nick Desaulniers Reviewed-by: Steven Rostedt (Google) Reviewed-by: Linus Walleij --- arch/arm/kernel/entry-ftrace.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S index a74289ebc803..f4886fb6e9ba 100644 --- a/arch/arm/kernel/entry-ftrace.S +++ b/arch/arm/kernel/entry-ftrace.S @@ -40,7 +40,7 @@ mcount_enter ldr r0, =ftrace_trace_function ldr r2, [r0] - adr r0, .Lftrace_stub + badr r0, .Lftrace_stub cmp r0, r2 bne 1f -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel