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 4CB3FC433EF for ; Mon, 31 Jan 2022 17:15:21 +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=i7dJYTdHXeohXyX+NDAncf7gTqqppeoKkkFtgIWtp4U=; b=O6+Mtq3I8cZyaf LzORqM2/h04ifgUbremzXvFdPzkMuoL6Zb0iMf7sndvSX2DjmR+5ZflcHQAUpHpT8wn4IPB11pBN2 rire+W0TLqFJn8g4+uMQy1U15WAmHHRIlQkZ2ixm0b3vjxHa/K7nMr3XP0+FOq4h28q1mvKBfUYu/ RjsFuBd6Y4v9XE3cwU58NXPmhYZEczuEwx3ugPzRCBuCAjiXMm+w9l1GlnQTIOV7Zjo7ZBXCe58bM kqpEyaP9WBy3BhlF254QA2bKp2QO9UnDj9vQTLjQX/gj0gc3/1ydNveXZSATspjlbQZ5CMRuXWCN3 1QjPeW2gb8TDjKdOcfyA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nEaFA-00A1xf-AW; Mon, 31 Jan 2022 17:13:32 +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 1nEa5u-009zDq-5K for linux-arm-kernel@lists.infradead.org; Mon, 31 Jan 2022 17:04:00 +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 A13F260C55; Mon, 31 Jan 2022 17:03:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5B15C340EE; Mon, 31 Jan 2022 17:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643648637; bh=n3HU6xD6cWTDjkJvZAR/+xJbFZB6LVKbXVsc+Uo9feA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RqI00cuR0KdjThLGIwQwnPSne4luJdDGH8q3AEhqIcMj7DCM1showF6WwaAnEJlMw 37bo1PtBMnVkHwiYzAx56kagFPL6F3HKK+Iv6cOSJf+yrG1WyKMWssAvOg0pc1UngR 1l1FzJb9/6eifHoPPKn+8/WbgJn272nV2j68Ga48m9DZTJTtziCHXVMaEFEb4QJ8g1 /bvlyBKUxQmFYNB5NkGk0qq37eLIQK1z2lFNi5HocMnpqFZ7gyjsK1/pP5BSwmaQoX tEnuQeuiEYhK24+2UNowOF6aZIVSK5tJxme378Fm7vk16gCJVHfKQOf7MhOS/rq/Rc iHAxcH6N1cmsw== 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 v2 01/12] ARM: ftrace: ensure that ADR take Thumb bit into account Date: Mon, 31 Jan 2022 18:03:36 +0100 Message-Id: <20220131170347.381551-2-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131170347.381551-1-ardb@kernel.org> References: <20220131170347.381551-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=889; h=from:subject; bh=n3HU6xD6cWTDjkJvZAR/+xJbFZB6LVKbXVsc+Uo9feA=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBh+BZdgs4LU8NJ0WaSroZLrxqp1kBjROa3gULtGJZM K9TzcO+JAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYfgWXQAKCRDDTyI5ktmPJMF7C/ 9I70FY/egwTBcOiJqdOpmaBAQ1uyZVi1CrCPFFCwfxkhhYv8uwYIdo8oC/Z0awC6NcKjZkdAgxJyIT PklYn28BGxcGqXeaCwcN2TmWc8WdghOQM3kiGqFa7NkZmjjox1NNLlwNwk6S16B20LWnl6hzK2B9RS To/ihrQ4boh2bV49IfxhB80mhYo9iD4Gc+UwFzK1B+ZAx5NKNBbC5GmFWkryXXjzkx08U0q+mP6ESi DNL4CilDHupGQTczKGiYaPqXqweA8Cs12Lf74qnHFwMA/R/6iyGhXbrd9NPPQQLGpJjDsT6vHLmecv vv/YQFJ8MGEiupPhaVdRPQECTqGdHnITbZHJKMFHgX2YXhTd7Ed64/LUeEBT7eA1XTk8+l466czCxE VTdvCuZGvR9ffChYweZcHy6+ewBzjBWiqbW23ibOTDTTQ/s6B692rjxTt9+XB0jTSzKuPtk0VBhkQ5 pF60PCi2eKYhkdEZeoQ2V6+CF3+j5PaCk6GUCe3C2DaYU= 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-20220131_090358_282934_5C88B6CA X-CRM114-Status: GOOD ( 13.48 ) 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 --- 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