From: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
To: <linux@armlinux.org.uk>, <linus.walleij@linaro.org>,
<arnd@arndb.de>, <keescook@chromium.org>,
<rmk+kernel@armlinux.org.uk>, <haibo.li@mediatek.com>,
<angelogioacchino.delregno@collabora.com>,
<amergnat@baylibre.com>, <xiaojiangfeng@huawei.com>
Cc: <akpm@linux-foundation.org>, <dave.hansen@linux.intel.com>,
<douzhaolei@huawei.com>, <gustavoars@kernel.org>,
<jpoimboe@kernel.org>, <kepler.chenxin@huawei.com>,
<kirill.shutemov@linux.intel.com>,
<linux-hardening@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-mm@kvack.org>, <linux-arm-kernel@lists.infradead.org>,
<nixiaoming@huawei.com>, <peterz@infradead.org>,
<wangbing6@huawei.com>, <wangfangpeng1@huawei.com>,
<jannh@google.com>, <willy@infradead.org>,
<David.Laight@ACULAB.COM>
Subject: [PATCH v3] ARM: unwind: improve unwinders for noreturn case
Date: Wed, 20 Mar 2024 23:41:34 +0800 [thread overview]
Message-ID: <1710949294-29287-1-git-send-email-xiaojiangfeng@huawei.com> (raw)
In-Reply-To: <1709516385-7778-1-git-send-email-xiaojiangfeng@huawei.com>
This is an off-by-one bug which is common in unwinders,
due to the fact that the address on the stack points
to the return address rather than the call address.
So, for example, when the last instruction of a function
is a function call (e.g., to a noreturn function), it can
cause the unwinder to incorrectly try to unwind from
the function after the callee.
foo:
...
bl bar
... end of function and thus next function ...
which results in LR pointing into the next function.
Fixed this by subtracting 1 from frmae->pc in the call frame
like ORC on x86 does.
Refer to the unwind_next_frame function in the unwind_orc.c
Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org>
Link: https://lkml.kernel.org/lkml/20240305175846.qnyiru7uaa7itqba@treble/
Suggested-by: "Russell King (Oracle)" <linux@armlinux.org.uk>
Link: https://lkml.kernel.org/lkml/Zeg8wRYFemMjcCxG@shell.armlinux.org.uk/
Signed-off-by: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
---
ChangeLog v1->v2
- stay printk("%s...", loglvl, ...)
ChangeLog v2->v3
- Redundant code is deleted to simplify the code
---
arch/arm/kernel/unwind.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index 9d21921..abfa8e9 100644
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -514,6 +514,14 @@ int unwind_frame(struct stackframe *frame)
frame->sp = ctrl.vrs[SP];
frame->lr = ctrl.vrs[LR];
frame->pc = ctrl.vrs[PC];
+ /*
+ * When the last instruction of a function is a function call
+ * (e.g., to a noreturn function), it can cause the unwinder
+ * incorrectly try to unwind from the function after the callee,
+ * fixed this by subtracting 1 from frame->pc in the call frame
+ * like ORC on x86 does.
+ */
+ frame->pc = frame->pc - 1;
frame->lr_addr = ctrl.lr_addr;
return URC_OK;
--
1.8.5.6
next prev parent reply other threads:[~2024-03-20 16:05 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-04 1:39 [PATCH] usercopy: delete __noreturn from usercopy_abort Jiangfeng Xiao
2024-03-04 15:15 ` Jann Horn
2024-03-04 17:40 ` Kees Cook
2024-03-05 3:31 ` Jiangfeng Xiao
2024-03-05 9:32 ` Kees Cook
2024-03-05 11:38 ` Jiangfeng Xiao
2024-03-05 17:58 ` Josh Poimboeuf
2024-03-06 4:00 ` Jiangfeng Xiao
2024-03-06 9:52 ` Russell King (Oracle)
2024-03-06 16:02 ` Josh Poimboeuf
2024-03-09 14:58 ` David Laight
2024-03-18 4:01 ` Jiangfeng Xiao
2024-03-05 2:54 ` Jiangfeng Xiao
2024-03-05 3:12 ` Jiangfeng Xiao
2024-03-20 2:19 ` [PATCH] ARM: unwind: improve unwinders for noreturn case Jiangfeng Xiao
2024-03-20 2:46 ` Kees Cook
2024-03-20 3:30 ` Jiangfeng Xiao
2024-03-20 3:34 ` Matthew Wilcox
2024-03-20 3:46 ` Jiangfeng Xiao
2024-03-20 3:44 ` [PATCH v2] " Jiangfeng Xiao
2024-03-20 8:45 ` Russell King (Oracle)
2024-03-20 15:30 ` Jiangfeng Xiao
2024-03-20 19:40 ` Russell King (Oracle)
2024-03-21 9:44 ` Jiangfeng Xiao
2024-03-21 10:22 ` David Laight
2024-03-21 11:23 ` Russell King (Oracle)
2024-03-21 12:07 ` David Laight
2024-03-21 12:22 ` Russell King (Oracle)
2024-03-21 12:57 ` David Laight
2024-03-21 13:08 ` Russell King (Oracle)
2024-03-21 14:37 ` David Laight
2024-03-21 14:56 ` Russell King (Oracle)
2024-03-21 15:20 ` David Laight
2024-03-21 15:33 ` Russell King (Oracle)
2024-03-21 22:43 ` Ard Biesheuvel
2024-03-22 0:08 ` Russell King (Oracle)
2024-03-22 9:24 ` David Laight
2024-03-22 9:52 ` Russell King (Oracle)
2024-03-22 12:54 ` Jiangfeng Xiao
2024-03-22 14:16 ` David Laight
2024-03-20 15:41 ` Jiangfeng Xiao [this message]
2024-03-20 19:42 ` [PATCH v3] " Russell King (Oracle)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1710949294-29287-1-git-send-email-xiaojiangfeng@huawei.com \
--to=xiaojiangfeng@huawei.com \
--cc=David.Laight@ACULAB.COM \
--cc=akpm@linux-foundation.org \
--cc=amergnat@baylibre.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=arnd@arndb.de \
--cc=dave.hansen@linux.intel.com \
--cc=douzhaolei@huawei.com \
--cc=gustavoars@kernel.org \
--cc=haibo.li@mediatek.com \
--cc=jannh@google.com \
--cc=jpoimboe@kernel.org \
--cc=keescook@chromium.org \
--cc=kepler.chenxin@huawei.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@armlinux.org.uk \
--cc=nixiaoming@huawei.com \
--cc=peterz@infradead.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=wangbing6@huawei.com \
--cc=wangfangpeng1@huawei.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox