2009-07-28 23:44:28

by Masami Hiramatsu

Subject: [BUGFIX PATCH] kprobes: Use kernel_text_address() for checking probe address

Use kernel_text_address() for checking probe address instead of
__kernel_text_address(), because __kernel_text_address() returns
!0 for init functions even after relaseing those functions.
That will hit a BUG() in text_poke().

Signed-off-by: Masami Hiramatsu <[email protected]>
Cc: Ananth N Mavinakayanahalli <[email protected]>
Cc: Jim Keniston <[email protected]>
---

kernel/kprobes.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 16b5739..0540948 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -694,7 +694,7 @@ int __kprobes register_kprobe(struct kprobe *p)
p->addr = addr;

preempt_disable();
- if (!__kernel_text_address((unsigned long) p->addr) ||
+ if (!kernel_text_address((unsigned long) p->addr) ||
in_kprobes_functions((unsigned long) p->addr)) {
preempt_enable();
return -EINVAL;


--
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]

2009-07-29 06:14:09

by Ananth N Mavinakayanahalli

Subject: Re: [BUGFIX PATCH] kprobes: Use kernel_text_address() for checking probe address

On Tue, Jul 28, 2009 at 07:47:23PM -0400, Masami Hiramatsu wrote:
> Use kernel_text_address() for checking probe address instead of
> __kernel_text_address(), because __kernel_text_address() returns
> !0 for init functions even after relaseing those functions.
> That will hit a BUG() in text_poke().
>
> Signed-off-by: Masami Hiramatsu <[email protected]>
> Cc: Ananth N Mavinakayanahalli <[email protected]>
> Cc: Jim Keniston <[email protected]>

Acked-by: Ananth N Mavinakayanahalli <[email protected]>