From: Jinyang He <hejinyang@loongson.cn>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Burton <paulburton@kernel.org>,
Jun-Ru Chang <jrjang@realtek.com>
Subject: [PATCH 3/4] MIPS: Fix get_frame_info() handing of function size
Date: Tue, 12 Jan 2021 20:29:16 +0800 [thread overview]
Message-ID: <1610454557-25867-4-git-send-email-hejinyang@loongson.cn> (raw)
In-Reply-To: <1610454557-25867-1-git-send-email-hejinyang@loongson.cn>
[1]: Commit b6c7a324df37b ("MIPS: Fix get_frame_info() handling of
microMIPS function size")
[2]: Commit 2b424cfc69728 ("MIPS: Remove function size check in
get_frame_info()")
First patch added a constant to check the number of iterations against.
Second patch fixed the situation that info->func_size is zero.
However, func_size member became useless after the second commit. Without
ip_end, the get frame_size operation may be out of range although KALLSYMS
enabled. Thus, check func_size first. Then make ip_end be the sum of ip
and a constant (512) if func_size is equal to 0. Otherwise make ip_end be
the sum of ip and func_size.
Signed-off-by: Jinyang He <hejinyang@loongson.cn>
---
arch/mips/kernel/process.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 94dfdf4..bef8f8d 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -390,10 +390,8 @@ static inline int is_sp_move_ins(union mips_instruction *ip, int *frame_size)
static int get_frame_info(struct mips_frame_info *info)
{
bool is_mmips = IS_ENABLED(CONFIG_CPU_MICROMIPS);
- union mips_instruction insn, *ip;
- const unsigned int max_insns = 128;
+ union mips_instruction insn, *ip, *ip_end;
unsigned int last_insn_size = 0;
- unsigned int i;
bool saw_jump = false;
info->pc_offset = -1;
@@ -403,7 +401,9 @@ static int get_frame_info(struct mips_frame_info *info)
if (!ip)
goto err;
- for (i = 0; i < max_insns; i++) {
+ ip_end = (void *)ip + (info->func_size ? info->func_size : 512);
+
+ while(ip < ip_end) {
ip = (void *)ip + last_insn_size;
if (is_mmips && mm_insn_16bit(ip->halfword[0])) {
--
2.1.0
next prev parent reply other threads:[~2021-01-12 12:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 12:29 [PATCH 0/4] MIPS: process: Some fixes and improvements about get_frame_info() Jinyang He
2021-01-12 12:29 ` [PATCH 1/4] MIPS: process: Reorder header files Jinyang He
2021-01-13 0:27 ` Huacai Chen
2021-01-15 14:46 ` Thomas Bogendoerfer
2021-01-18 10:02 ` Jinyang He
2021-01-18 11:27 ` Jinyang He
2021-01-18 22:11 ` Thomas Bogendoerfer
2021-01-12 12:29 ` [PATCH 2/4] MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op Jinyang He
2021-01-12 12:29 ` Jinyang He [this message]
2021-01-12 12:29 ` [PATCH 4/4] MIPS: Add is_jr_ra_ins() to end the loop early Jinyang He
2021-10-23 18:32 ` Maciej W. Rozycki
2021-10-25 2:11 ` Jinyang He
2021-01-18 1:51 ` [PATCH 0/4] MIPS: process: Some fixes and improvements about get_frame_info() Jiaxun Yang
2021-01-19 1:29 ` Jinyang He
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=1610454557-25867-4-git-send-email-hejinyang@loongson.cn \
--to=hejinyang@loongson.cn \
--cc=jrjang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=paulburton@kernel.org \
--cc=tsbogend@alpha.franken.de \
/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;
as well as URLs for NNTP newsgroup(s).