From: ji.zhang@mediatek.com (Ji Zhang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: fix text section corruption
Date: Fri, 22 Sep 2017 11:15:19 +0800 [thread overview]
Message-ID: <1506050119-2670-1-git-send-email-ji.zhang@mediatek.com> (raw)
When CONFIG_CPU_SW_DOMAIN_PAN is enabled, there are 9 registers being
pushed into stack in save_regs, but in fixup it still consider there are
8 registers in stack, which is the case of CONFIG_CPU_SW_DOMAIN_PAN
disabled.
When fixup being executed, -EFAULT will be written to the text section.
In fixup:
mov r4, #-EFAULT
/*
* When CONFIG_CPU_SW_DOMAIN_PAN enabled, r5 will load the value stored by
* lr in save_regs, which is the address of instruction in text section.
*/
ldr r5, [sp,#8*4] @err_ptr
/*
* This will write -EFAULT(0xfffffff2) to r5, which points to text section
* now, and when function returns, it will use 0xfffffff2 as an
* instruction, then undefined instruction occurs.
*/
str r4, [r5]
Signed-off-by: Ji Zhang <ji.zhang@mediatek.com>
---
arch/arm/lib/csumpartialcopyuser.S | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
index 1712f13..b83fdc0 100644
--- a/arch/arm/lib/csumpartialcopyuser.S
+++ b/arch/arm/lib/csumpartialcopyuser.S
@@ -85,7 +85,11 @@
.pushsection .text.fixup,"ax"
.align 4
9001: mov r4, #-EFAULT
+#ifdef CONFIG_CPU_SW_DOMAIN_PAN
+ ldr r5, [sp, #9*4] @ *err_ptr
+#else
ldr r5, [sp, #8*4] @ *err_ptr
+#endif
str r4, [r5]
ldmia sp, {r1, r2} @ retrieve dst, len
add r2, r2, r1
--
1.9.1
next reply other threads:[~2017-09-22 3:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 3:15 Ji Zhang [this message]
2017-10-25 9:17 ` [PATCH] arm: fix text section corruption Ji.Zhang
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=1506050119-2670-1-git-send-email-ji.zhang@mediatek.com \
--to=ji.zhang@mediatek.com \
--cc=linux-arm-kernel@lists.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