Commit 3b27d139 authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo

perf dwarf: Fix potential array out of bounds access

There is a problem in the dwarf-regs.c files for sh, sparc and x86 where
it is possible to make an out-of-bounds array access when searching for
register names.

This patch fixes it by replacing '<=' to '<', so when register (number
== XXX_MAX_REGS), get_arch_regstr() will return NULL.
Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Reviewed-by: default avatarMatt Fleming <matt@console-pimps.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@huawei.com
Link: http://lkml.kernel.org/r/1441078184-105038-1-git-send-email-wangnan0@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 53202661
...@@ -51,5 +51,5 @@ const char *sh_regs_table[SH_MAX_REGS] = { ...@@ -51,5 +51,5 @@ const char *sh_regs_table[SH_MAX_REGS] = {
/* Return architecture dependent register string (for kprobe-tracer) */ /* Return architecture dependent register string (for kprobe-tracer) */
const char *get_arch_regstr(unsigned int n) const char *get_arch_regstr(unsigned int n)
{ {
return (n <= SH_MAX_REGS) ? sh_regs_table[n] : NULL; return (n < SH_MAX_REGS) ? sh_regs_table[n] : NULL;
} }
...@@ -39,5 +39,5 @@ const char *sparc_regs_table[SPARC_MAX_REGS] = { ...@@ -39,5 +39,5 @@ const char *sparc_regs_table[SPARC_MAX_REGS] = {
*/ */
const char *get_arch_regstr(unsigned int n) const char *get_arch_regstr(unsigned int n)
{ {
return (n <= SPARC_MAX_REGS) ? sparc_regs_table[n] : NULL; return (n < SPARC_MAX_REGS) ? sparc_regs_table[n] : NULL;
} }
...@@ -71,5 +71,5 @@ const char *x86_64_regs_table[X86_64_MAX_REGS] = { ...@@ -71,5 +71,5 @@ const char *x86_64_regs_table[X86_64_MAX_REGS] = {
/* Return architecture dependent register string (for kprobe-tracer) */ /* Return architecture dependent register string (for kprobe-tracer) */
const char *get_arch_regstr(unsigned int n) const char *get_arch_regstr(unsigned int n)
{ {
return (n <= ARCH_MAX_REGS) ? arch_regs_table[n] : NULL; return (n < ARCH_MAX_REGS) ? arch_regs_table[n] : NULL;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment