Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp960337pxb; Wed, 6 Apr 2022 05:22:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMVdB1n8R4Yi6GAbWKOvIkriv9uvWnmzfOD9ExvLlzzy9Os/IhUa9Gms7rge6iC74kF5Ry X-Received: by 2002:a17:903:230c:b0:156:e47:387e with SMTP id d12-20020a170903230c00b001560e47387emr8737201plh.119.1649247749843; Wed, 06 Apr 2022 05:22:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649247749; cv=none; d=google.com; s=arc-20160816; b=QVDCp83KFJAdzIJuwHogWsUZUCXxUAmPdCwKVY+f9aD9XDbxHA62CHZHyOAsX7muqN 8svRWiul9MVIapIAqxS70xvsiFGd4Aq6TCp4SgfZ7BpBAIydes2AyEScevZgc2oXwTU7 nNXEl4kXLxm7KzvcoUoDNWHFGiYGbRCbTk8grVMEykjc9V8xOOOOQQHeQMdVKZyZgDni iQ5u1L5AaESu7JNzZqWxcTdloPHxgE+ZfrcR111nCCQlsnqTp7O9PZmthqGnZuU+w/Fb T34LxtQyw/GTQbuAJY69TuNMh48JaSobBiGiPbblnndvRVUtALQaIC4BQRtvU9z1gYCI gwMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BWmuqfK8IAXxIlYg7dIQTXsXZpPKIzVl9+kSjTuwQyE=; b=GOkfD72PSM9+L4olG3KoFzNn8FVvpRLDiviJr8C0D9XA+RwZmGznVg+li18qJmlneA jv1q0hnAYxJpN33XXQfiC1stdq6fQ5N3//qgpZ+MKszZF2fQ1MORsDnSzzb/gOnGX7gX +HvXGQhASt/cqmufM7tj168Bglfl0pDVz5nssxDR2X0QSwaOLc5MhNQNgoJRDiyPJhr7 JQ6h1OMKK38gvrYvFTXdFYlPR3GFjugubmKN2u8qblE0huMA69FGJWPgz1CwTqWw52wM KvBmKM0oMHtWBHkkOe7xNKJQJFpN77syKUn3NR93PngQ2wQrRCURz/6q+TtSP52jQG/3 fwxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FYHqIhEX; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id k3-20020a170902c40300b00153b2d16628si17287752plk.560.2022.04.06.05.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:22:29 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FYHqIhEX; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2A02B54962F; Wed, 6 Apr 2022 04:19:52 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233128AbiDFBnI (ORCPT + 99 others); Tue, 5 Apr 2022 21:43:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357431AbiDEK0V (ORCPT ); Tue, 5 Apr 2022 06:26:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D5476249; Tue, 5 Apr 2022 03:10:09 -0700 (PDT) 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 1C0F9617A4; Tue, 5 Apr 2022 10:10:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26FA8C385A0; Tue, 5 Apr 2022 10:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649153408; bh=7PbildU4fVy2AP3yvxFY7nRP8gtRqmn3F61F8jyqIRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FYHqIhEXeNkeVNt1gNha4JRnQqVZgYuM+Un4cc72NqGkcEN6zQe40nYRKiwWxfP7O JlZhibqeS+p2J6GWtl8Hy00aTjyWPV63Kaqq8xTgzkpHs9pskG4VVEYP0gpL675eeW nTHX7ETLXJX69u5OyUlbcEKO75CtqNAT/2nMwG2g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , Nick Desaulniers , "Steven Rostedt (Google)" , Linus Walleij , Sasha Levin Subject: [PATCH 5.10 213/599] ARM: ftrace: ensure that ADR takes the Thumb bit into account Date: Tue, 5 Apr 2022 09:28:27 +0200 Message-Id: <20220405070305.181038401@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070258.802373272@linuxfoundation.org> References: <20220405070258.802373272@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit dd88b03ff0c84f4bcbe1419b93a4bed429fed3be ] 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 Signed-off-by: Sasha Levin --- 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.34.1