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 34155C433F5 for ; Tue, 25 Jan 2022 15:47:07 +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=WNBPxZbn5T/8V0DH1mfqZtqNB+JCda0xgnlCu1U+TiQ=; b=WvYR0tZ9AsLW5n ROtPFKrCxwxfw3PtCSDeGIlEO7va5nMkGk2px9eON/b8c8VYJ0aVpX2p7M0vMaN9K10e2tu1rVqv9 vAmh+11HOFapXIgokQLI9Nqg5lU3s2JWk/G/ZmZt0YOFmDjj5R4cVC3F5OgmyC8f9YxkIivrdUs0r UcLBTbQappGkgjlpB3XLqlCS03un2zUYqnujCPvi0G3eAt4KY+bAE6nlbgXExb6JtHxosO6agKiHt ZyzF+dCAR5N1MiYDByH9Ef35/Hv5ju2JDV3dndDiwzKJQuCvvf9GfzwFzEm3VY2UdEAubVIe+ZvMI ihM5yUHQwzmDqD7Znqfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCO0b-008RwM-2o; Tue, 25 Jan 2022 15:45:26 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCNsj-008Q5X-OJ for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 15:37:19 +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 ams.source.kernel.org (Postfix) with ESMTPS id 646A5B8187F; Tue, 25 Jan 2022 15:37:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C327BC340E5; Tue, 25 Jan 2022 15:37:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643125035; bh=wmlboPDmlCxMsPIhqHcCVPMJ+KLKBTZucEN16mjERs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hpFLJ4t1wbSb1smNQMdt0LWgrC6Dabjg5gUhkf8h2oh1eNz+qlLqGlYD6aUcq7jCE GwtnmYXHEijzAG2HWyWwljGgSE8uniIqjiP55ZQocz5ZXov/kTlthKjMfGoOKMK4xn nhxAvEs59E4OhucQn/DZuxO//ZtAEP0xfF7hJKtwK6Nr/0F7nlmd0A+BZD9Rs9X8LK YnE3OOxVvRvYTaIQUPNcitk3At5J2FuOlMVNITEkrs9tjmebfr8OPIjtHV36hCW/hu cQ2MUsei7KdcMmUhxb3kVX/zFUcGOlJMR4+kc9xg66aQDTyJchWOui9q17P9gN4lne whzRKyI3I8SfA== From: Ard Biesheuvel To: linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Arnd Bergmann , Linus Walleij , Nick Desaulniers Subject: [PATCH 1/8] ARM: ftrace: ensure that ADR take Thumb bit into account Date: Tue, 25 Jan 2022 16:36:49 +0100 Message-Id: <20220125153656.1802079-2-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220125153656.1802079-1-ardb@kernel.org> References: <20220125153656.1802079-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=832; h=from:subject; bh=wmlboPDmlCxMsPIhqHcCVPMJ+KLKBTZucEN16mjERs0=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBh8BkKt/DhEfoqXCdo48D3wSn8iVz53+gjJsD5a7z9 cVxX8uGJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYfAZCgAKCRDDTyI5ktmPJDTBDA C+eRBeci2M+bA4+Dwgfb6VhcphlNNOGFbU9eC2RlkFRY4b3T4VCf9xK55ouGX4e06+sgIszGgmeS6Z YktlLvm5zPMxDjWWxo9+FnXlV/WoHqoHurZ7+UkEmyKwxPpGEdevarxUBAxOBjBoHprC4JUf/y9CZb 3ho80cX7e2iraYsKmEUG0rrpSzxMIQDPo/FT+UCGn0E/g7+hcXYPS1MV+mIM+IxS6fsTx5d5i7gv+x kV4f3pEQderc10zL9PRz6lmMaaAH6kxco7ps209E/sIX3Fo2OK0hLc7e1wN82nKECicPPQ6S3q2fl6 UtgSQG3Q4H8EIsoiHC1bW3C8WC4wvvw1p6vTLi7dsT8XuHIq07xD4jzbOWSDIXpg73y3sEolpwLVDn hdVtJJVbIo69+nLUfRPMRgitVqwPxRB003RrOLro7t5ijdtM0BOd0TOu+AewuWkKfA+UEVSmhvuMsy hQudLWvpM9sXD9AyuCV6vsL2EJVeJMu4ZHtnivnaP0hoY= 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-20220125_073717_969036_80F89662 X-CRM114-Status: GOOD ( 13.42 ) 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 --- 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