aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Bui-Huu <vagabon.xyz@gmail.com>2006-08-18 16:18:08 +0200
committerRalf Baechle <ralf@linux-mips.org>2006-09-27 13:37:58 +0100
commit29b376ff10aaea69ee4d93b70d0fbb2ebfd80f4e (patch)
treeb498fe6a70b26fe9a3dd79d51eaf744951b74583
parent1fd6909802b837ed5510603846c0ce5938d296a1 (diff)
[MIPS] get_frame_info(): null function size means size is unknown
This patch adds 2 sanity checks. The first one test that the start address of the function to analyze has been set by the caller. If not return an error since nothing usefull can be done without. The second one checks that the function's size has been set. A null size can happen if CONFIG_KALLSYMS is not set and it means that we don't know the size of the function to analyze. In this case, we make it equal to 128 instructions by default. Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/kernel/process.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index e7b0b385fb2..b160ea30de0 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -311,12 +311,19 @@ static inline int is_sp_move_ins(union mips_instruction *ip)
static int get_frame_info(struct mips_frame_info *info)
{
union mips_instruction *ip = info->func;
- int i, max_insns =
- min(128UL, info->func_size / sizeof(union mips_instruction));
+ unsigned max_insns = info->func_size / sizeof(union mips_instruction);
+ unsigned i;
info->pc_offset = -1;
info->frame_size = 0;
+ if (!ip)
+ goto err;
+
+ if (max_insns == 0)
+ max_insns = 128U; /* unknown function size */
+ max_insns = min(128U, max_insns);
+
for (i = 0; i < max_insns; i++, ip++) {
if (is_jal_jalr_jr_ins(ip))
@@ -337,6 +344,7 @@ static int get_frame_info(struct mips_frame_info *info)
if (info->pc_offset < 0) /* leaf */
return 1;
/* prologue seems boggus... */
+err:
return -1;
}