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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFB58C433F5 for ; Sun, 17 Oct 2021 13:20:30 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 852B361260 for ; Sun, 17 Oct 2021 13:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 852B361260 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=KmXq6Cjyq7y5Zna29dxI7H/BJGkNf/zgc6J2FWa4gjA=; b=TTxzvvcNhNGBut 8g/3hzIeuZMLFe7Kb7AGROxTSRufNxtf4jeNJAnnqHD74PcIGrI0viMvX6HDtengBT9CgnhG3TLZb BRicMsY2rSVzZinQnXYq2JffdDPnX/MB9S+BdkeARgJOfdLagM3wXDCyXWpOziwuyojG8ndnUwKx8 I9Acen+/dYNIF58X5iiDp7OU+/VAhLVzXtOhLBc8XfqYFPjIeTPE7gmJkAHe5hB87pG1K/tc8PQ7X kEdILm+V1mNuaBwEsTlb+Y4UkCVorxSN54fzeVakYhwrl4pzRZRd9EmWl7oBKdXWiAGXeKYLLA/Af i7MCF5stsc5huTP6CNJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mc64E-00Cb7I-6b; Sun, 17 Oct 2021 13:19:10 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mc62w-00CadX-9y for linux-arm-kernel@lists.infradead.org; Sun, 17 Oct 2021 13:17:51 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D596361248; Sun, 17 Oct 2021 13:17:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634476670; bh=n6ZLz4R2AQLlOKG2q9QP07c9sYrfSKTHO3Dw4AMpi+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ROUJ3zhORSjgRDjtV3EssySuMwFgQncws8rj1NlqtMFSjvuRCA2RG5+iYy9U/k5iw ScuYqWbujmh6yHhyv+ZgfQwiLBTLnkJVM7Hog3nY1L1SWX/M/meo7CBPTRQLD/yiDn ync/IJLSvPTfjSOUoeTQTLrVAqtSzzjr0OhpUIeozOf1uFphIZ5LKUwK3VgYdZwGyc 3GpcuHKiXmiNHohMqHUloweZLwyisui378Wcq3f2iAyPFIs8NHBpGXdai48hOpMqZs koY9DfbkbOKV6KON6BI2RdjRHsugbxtgDnW+RsgsUuFc/DJg9oWITE/UJPb17WKe90 my6iVKx7hAc0g== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Russell King , Arnd Bergmann , Kees Cook , Keith Packard , Linus Walleij , Nick Desaulniers , Nicolas Pitre Subject: [PATCH v3 07/10] ARM: backtrace-clang: avoid crash on bogus frame pointer Date: Sun, 17 Oct 2021 15:17:20 +0200 Message-Id: <20211017131723.4034662-8-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211017131723.4034662-1-ardb@kernel.org> References: <20211017131723.4034662-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1682; h=from:subject; bh=n6ZLz4R2AQLlOKG2q9QP07c9sYrfSKTHO3Dw4AMpi+A=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBhbCJc6EbBIeO1q9gX8PB+hWVbtSDkELzzSC8RdlZF Vva74f+JAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYWwiXAAKCRDDTyI5ktmPJN7UC/ 9CDSqQ5PfCg0Z1oPKtQwzG4TSKMmlZ+QeeuLk1UbvpjAbjCevbXMuqF1X3Vw9gNdxcEKcliSG/yLMU xBIR4BZmXoXNi4o5Fq8ip+17bkLmhWnPKCapvlUQl5zFixal2cJmBjq4rra7pwbspv6m596N1ceTyp Glb3IOvleFLmrwXdbaU8mMTGry5wG06sblEaGDB4t3NoRMoniPHGGWPMQuvG2BaFMoV+bqkGqLkKE+ YCwMAuFwqqgtDnHb6C/7UuRLAiHY5gndDtOE56P068D+wmuFH0iBN8coHxOGwcXvv2zB7knc7+0Iq/ O5MECICXQ8XI9WKJiIwz/kaWuh+WQwpKyglsMYQeKue67ixfMD9FN2Llm41So/WeNqdQEE60DKngYU TZtHq6t6fbAnX6zE2YxxFoKw4amtAckgtDYGmzcIixY686omsx+q5tn9hQ12fzd8zpYPhYUKLUCJsW kcqBqbKZxKkObnhZf1iKJ2DyKQU9gWvoqZ9jmCqHpe57w= 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-20211017_061750_400332_12E5E97A 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 The Clang backtrace code dereferences the link register value pulled from the stack to decide whether the caller was a branch-and-link instruction, in order to subsequently decode the offset to find the start of the calling function. Unlike other loads in this routine, this one is not protected by a fixup, and may therefore cause a crash if the address in question is bogus. So let's fix this, by treating the fault as a failure to decode the 'bl' instruction. To avoid a label renum, reuse a fixup label that guards an instruction that cannot fault to begin with. Signed-off-by: Ard Biesheuvel --- arch/arm/lib/backtrace-clang.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/lib/backtrace-clang.S b/arch/arm/lib/backtrace-clang.S index 5b2cdb1003e3..5b4bca85d06d 100644 --- a/arch/arm/lib/backtrace-clang.S +++ b/arch/arm/lib/backtrace-clang.S @@ -144,7 +144,7 @@ for_each_frame: tst frame, mask @ Check for address exceptions */ 1003: ldr sv_lr, [sv_fp, #4] @ get saved lr from next frame - ldr r0, [sv_lr, #-4] @ get call instruction +1004: ldr r0, [sv_lr, #-4] @ get call instruction ldr r3, .Lopcode+4 and r2, r3, r0 @ is this a bl call teq r2, r3 @@ -164,7 +164,7 @@ finished_setup: /* * Print the function (sv_pc) and where it was called from (sv_lr). */ -1004: mov r0, sv_pc + mov r0, sv_pc mov r1, sv_lr mov r2, frame @@ -210,7 +210,7 @@ ENDPROC(c_backtrace) .long 1001b, 1006b .long 1002b, 1006b .long 1003b, 1006b - .long 1004b, 1006b + .long 1004b, finished_setup .long 1005b, 1006b .popsection -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel