kallsyms: Don't let kallsyms_lookup_size_offset() fail on retrieving the first symbol
diff mbox series

Message ID 20190824131231.26399-1-maz@kernel.org
State Accepted
Commit 2a1a3fa0f29270583f0e6e3100d609e09697add1
Headers show
Series
  • kallsyms: Don't let kallsyms_lookup_size_offset() fail on retrieving the first symbol
Related show

Commit Message

Marc Zyngier Aug. 24, 2019, 1:12 p.m. UTC
An arm64 kernel configured with

  CONFIG_KPROBES=y
  CONFIG_KALLSYMS=y
  # CONFIG_KALLSYMS_ALL is not set
  CONFIG_KALLSYMS_BASE_RELATIVE=y

reports the following kprobe failure:

  [    0.032677] kprobes: failed to populate blacklist: -22
  [    0.033376] Please take care of using kprobes.

It appears that kprobe fails to retrieve the symbol at address
0xffff000010081000, despite this symbol being in System.map:

  ffff000010081000 T __exception_text_start

This symbol is part of the first group of aliases in the
kallsyms_offsets array (symbol names generated using ugly hacks in
scripts/kallsyms.c):

  kallsyms_offsets:
          .long   0x1000 // do_undefinstr
          .long   0x1000 // efi_header_end
          .long   0x1000 // _stext
          .long   0x1000 // __exception_text_start
          .long   0x12b0 // do_cp15instr

Looking at the implementation of get_symbol_pos(), it returns the
lowest index for aliasing symbols. In this case, it return 0.

But kallsyms_lookup_size_offset() considers 0 as a failure, which
is obviously wrong (there is definitely a valid symbol living there).
In turn, the kprobe blacklisting stops abruptly, hence the original
error.

A CONFIG_KALLSYMS_ALL kernel wouldn't fail as there is always
some random symbols at the beginning of this array, which are never
looked up via kallsyms_lookup_size_offset.

Fix it by considering that get_symbol_pos() is always successful
(which is consistent with the other uses of this function).

Fixes: ffc5089196446 ("[PATCH] Create kallsyms_lookup_size_offset()")
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 kernel/kallsyms.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Masami Hiramatsu Aug. 26, 2019, 1:46 a.m. UTC | #1
On Sat, 24 Aug 2019 14:12:31 +0100
Marc Zyngier <maz@kernel.org> wrote:

> An arm64 kernel configured with
> 
>   CONFIG_KPROBES=y
>   CONFIG_KALLSYMS=y
>   # CONFIG_KALLSYMS_ALL is not set
>   CONFIG_KALLSYMS_BASE_RELATIVE=y
> 
> reports the following kprobe failure:
> 
>   [    0.032677] kprobes: failed to populate blacklist: -22
>   [    0.033376] Please take care of using kprobes.
> 
> It appears that kprobe fails to retrieve the symbol at address
> 0xffff000010081000, despite this symbol being in System.map:
> 
>   ffff000010081000 T __exception_text_start
> 
> This symbol is part of the first group of aliases in the
> kallsyms_offsets array (symbol names generated using ugly hacks in
> scripts/kallsyms.c):
> 
>   kallsyms_offsets:
>           .long   0x1000 // do_undefinstr
>           .long   0x1000 // efi_header_end
>           .long   0x1000 // _stext
>           .long   0x1000 // __exception_text_start
>           .long   0x12b0 // do_cp15instr
> 
> Looking at the implementation of get_symbol_pos(), it returns the
> lowest index for aliasing symbols. In this case, it return 0.
> 
> But kallsyms_lookup_size_offset() considers 0 as a failure, which
> is obviously wrong (there is definitely a valid symbol living there).
> In turn, the kprobe blacklisting stops abruptly, hence the original
> error.
> 
> A CONFIG_KALLSYMS_ALL kernel wouldn't fail as there is always
> some random symbols at the beginning of this array, which are never
> looked up via kallsyms_lookup_size_offset.
> 
> Fix it by considering that get_symbol_pos() is always successful
> (which is consistent with the other uses of this function).

Thank you for fixing this issue!
This looks good to me :)

Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>

Thank you,

> 
> Fixes: ffc5089196446 ("[PATCH] Create kallsyms_lookup_size_offset()")
> Cc: Masami Hiramatsu <mhiramat@kernel.org>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Will Deacon <will@kernel.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
>  kernel/kallsyms.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
> index 95a260f9214b..136ce049c4ad 100644
> --- a/kernel/kallsyms.c
> +++ b/kernel/kallsyms.c
> @@ -263,8 +263,10 @@ int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize,
>  {
>  	char namebuf[KSYM_NAME_LEN];
>  
> -	if (is_ksym_addr(addr))
> -		return !!get_symbol_pos(addr, symbolsize, offset);
> +	if (is_ksym_addr(addr)) {
> +		get_symbol_pos(addr, symbolsize, offset);
> +		return 1;
> +	}
>  	return !!module_address_lookup(addr, symbolsize, offset, NULL, namebuf) ||
>  	       !!__bpf_address_lookup(addr, symbolsize, offset, namebuf);
>  }
> -- 
> 2.20.1
>
Will Deacon Aug. 27, 2019, 10:08 a.m. UTC | #2
On Mon, Aug 26, 2019 at 10:46:38AM +0900, Masami Hiramatsu wrote:
> On Sat, 24 Aug 2019 14:12:31 +0100
> Marc Zyngier <maz@kernel.org> wrote:
> 
> > An arm64 kernel configured with
> > 
> >   CONFIG_KPROBES=y
> >   CONFIG_KALLSYMS=y
> >   # CONFIG_KALLSYMS_ALL is not set
> >   CONFIG_KALLSYMS_BASE_RELATIVE=y
> > 
> > reports the following kprobe failure:
> > 
> >   [    0.032677] kprobes: failed to populate blacklist: -22
> >   [    0.033376] Please take care of using kprobes.
> > 
> > It appears that kprobe fails to retrieve the symbol at address
> > 0xffff000010081000, despite this symbol being in System.map:
> > 
> >   ffff000010081000 T __exception_text_start
> > 
> > This symbol is part of the first group of aliases in the
> > kallsyms_offsets array (symbol names generated using ugly hacks in
> > scripts/kallsyms.c):
> > 
> >   kallsyms_offsets:
> >           .long   0x1000 // do_undefinstr
> >           .long   0x1000 // efi_header_end
> >           .long   0x1000 // _stext
> >           .long   0x1000 // __exception_text_start
> >           .long   0x12b0 // do_cp15instr
> > 
> > Looking at the implementation of get_symbol_pos(), it returns the
> > lowest index for aliasing symbols. In this case, it return 0.
> > 
> > But kallsyms_lookup_size_offset() considers 0 as a failure, which
> > is obviously wrong (there is definitely a valid symbol living there).
> > In turn, the kprobe blacklisting stops abruptly, hence the original
> > error.
> > 
> > A CONFIG_KALLSYMS_ALL kernel wouldn't fail as there is always
> > some random symbols at the beginning of this array, which are never
> > looked up via kallsyms_lookup_size_offset.
> > 
> > Fix it by considering that get_symbol_pos() is always successful
> > (which is consistent with the other uses of this function).
> 
> Thank you for fixing this issue!
> This looks good to me :)
> 
> Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>

There doesn't appear to be an official tree for this file so, unless anybody
objects, I'll pick this up via arm64 as it's looking like there are some
other fixes on the horizon too.

Will

Patch
diff mbox series

diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 95a260f9214b..136ce049c4ad 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -263,8 +263,10 @@  int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize,
 {
 	char namebuf[KSYM_NAME_LEN];
 
-	if (is_ksym_addr(addr))
-		return !!get_symbol_pos(addr, symbolsize, offset);
+	if (is_ksym_addr(addr)) {
+		get_symbol_pos(addr, symbolsize, offset);
+		return 1;
+	}
 	return !!module_address_lookup(addr, symbolsize, offset, NULL, namebuf) ||
 	       !!__bpf_address_lookup(addr, symbolsize, offset, namebuf);
 }