Message ID | 20220124174744.1054712-22-ardb@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> 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 68995C433F5 for <linux-arm-kernel@archiver.kernel.org>; Mon, 24 Jan 2022 18:04:31 +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=+/7W2OD3b05zAWukCIO/bJ1Ag+pRK0bHik7FPrNb9Cc=; b=iEWWZbSB/b+VsI C78NRAODJ4dbFj0B0HtEtBxlYIFLpxrh77ZhuNd1msMORrz0/xDeGMxrqmsTXVWm/BP1hb9fhyEC6 +RHUcz3c6X20OSQocTxC3bHJ9W0bwvN/yusyw2vmlv/EgPjQ6Jl8LkS3RlYqntSnOYCza66PwZ1Dl vkyqhcMB0ZI1+Fjx5eqEWWnQhBpK4LUQ2MKAMtN8CRwbrBHR24Nyhl7vR7LUIJvrwS1auL6Gye2jR gyzZy235ee0xBNfHy+QCTRKlOzWIxKT3gpsmvyPg3xmwY1hrPw20KFYCzVaekt/AFPWWSuIz0c2ZF 1Qpn3AFPzA6FITpNA1QA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nC3fU-004LQf-H0; Mon, 24 Jan 2022 18:02:17 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nC3Si-004FWz-LU for linux-arm-kernel@lists.infradead.org; Mon, 24 Jan 2022 17:49:08 +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 2B81F6134A; Mon, 24 Jan 2022 17:49:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD898C340EB; Mon, 24 Jan 2022 17:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643046543; bh=IyXLRNWIOeJXRX4t2kvNBhRazTOZFHXbCV4DuNm6yhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jBLvtlPmox7eoCnci1z8lc03/NbncHs29o1ga5lK6cDG5dZiYchIfIZnxAXxmbnFr nQ27aKh80LBqTT4DkfCgbZ7lc1fWz2PK7/8FUq6XNw9BslTw3XW3M7HPIGwiv8AV13 65u5RrR8Fi8FNaYgVC6B4kqhpa9b+lgoCUIpCQCNCUJutg5OIKZi8Y7+ERHQ424E1P hXoBkZNGgm9g1lpGnIE9jh/XY66I+5VmtMtl205dF/QvHZe5z4kHuJ7ntjA3FY+o44 Rlxza/yG5uTdxU5CAdx3mjLEpQJHF7YwKz0OIjU+RH1qzUAd4omxWaMxkrbTho5RE/ We1A6re5+vkjw== From: Ard Biesheuvel <ardb@kernel.org> To: linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Cc: linux-hardening@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>, Nicolas Pitre <nico@fluxnic.net>, Arnd Bergmann <arnd@arndb.de>, Kees Cook <keescook@chromium.org>, Keith Packard <keithpac@amazon.com>, Linus Walleij <linus.walleij@linaro.org>, Nick Desaulniers <ndesaulniers@google.com>, Tony Lindgren <tony@atomide.com>, Marc Zyngier <maz@kernel.org>, Vladimir Murzin <vladimir.murzin@arm.com>, Jesse Taube <mr.bossman075@gmail.com> Subject: [PATCH v5 21/32] ARM: backtrace-clang: avoid crash on bogus frame pointer Date: Mon, 24 Jan 2022 18:47:33 +0100 Message-Id: <20220124174744.1054712-22-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124174744.1054712-1-ardb@kernel.org> References: <20220124174744.1054712-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1844; h=from:subject; bh=IyXLRNWIOeJXRX4t2kvNBhRazTOZFHXbCV4DuNm6yhU=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBh7uYps+q5+cFdeGunJhVyQFYUrEBbfJR7dkCOrjxx 0q1S8luJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYe7mKQAKCRDDTyI5ktmPJKi2DA CuvB6mK3w1TmO3L+nCUgb1iFTKM/g0v23bk598pnw1nIPSLGSyEw+XHUVswnJMnV6064J3IxoIx19j Du59SqdXBy9PPXqaWI62+M03XMtE0Ab1n7yrLs/igODxVSDuVCaClvJXdcQLEEZfOWmv9LP+yr0SDR XHyFy42QSzwpyJPnuS/ozqDFGbVS84djudpPlr62ZhdsGQXxo4S+LbRKeXjh3iaL4x7eKm0X/WZaZg Di3IZhieYGQwK9He5a1/Xs0qVlYOd5/T0662iCC7BxBOfCUotIO7jtq7LHiWsQqmmDgyfvdyA8JUU7 ZIsOB7EoCUWUsRmEHwxaYdI2v3nwRl0iWXgGJfSTfvd2Yl1AoxCWPR5wf3bvpth8XkPhRxI+Zc2h5k MwY4odyRIxcDGbtww3Pjil8cQIIWmiOoADoNsssL0xEMIZ4JnqYYCNnhuxI2EgyIz69XnYPYMXEx5P 4rUVN0i0nPCiih4GUS4vgVh+1yazAtSnDI8YpIQiXbATc= 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-20220124_094904_843892_69D38FE7 X-CRM114-Status: GOOD ( 15.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
ARM vmap'ed and IRQ stacks roundup
|
expand
|
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