Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1595393 > unrolled thread

[TRIVIAL PATCH 2/2] kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [TRIVIAL PATCH 2/2] kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2017-03-08 18:10 +0100
    Re: [TRIVIAL PATCH 2/2] kprobes: Convert kprobe_exceptions_notify  to use NOKPROBE_SYMBOL Masami Hiramatsu <mhiramat@kernel.org> - 2017-03-09 09:00 +0100

#1595393 — [TRIVIAL PATCH 2/2] kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL

commit fc62d0207ae0 ("kprobes: Introduce weak variant of
kprobe_exceptions_notify()") used the __kprobes annotation to exclude
kprobe_exceptions_notify from being probed. Since NOKPROBE_SYMBOL() is a
better way to do this enabling the symbol to be discovered as being
blacklisted, change over to using NOKPROBE_SYMBOL().

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
 kernel/kprobes.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 699c5bc51a92..b52d952d6d41 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1740,11 +1740,12 @@ void unregister_kprobes(struct kprobe **kps, int num)
 }
 EXPORT_SYMBOL_GPL(unregister_kprobes);
 
-int __weak __kprobes kprobe_exceptions_notify(struct notifier_block *self,
-					      unsigned long val, void *data)
+int __weak kprobe_exceptions_notify(struct notifier_block *self,
+					unsigned long val, void *data)
 {
 	return NOTIFY_DONE;
 }
+NOKPROBE_SYMBOL(kprobe_exceptions_notify);
 
 static struct notifier_block kprobe_exceptions_nb = {
 	.notifier_call = kprobe_exceptions_notify,
-- 
2.11.1

[toc] | [next] | [standalone]

#1595739 — Re: [TRIVIAL PATCH 2/2] kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL

On Wed,  8 Mar 2017 22:34:15 +0530
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote:

> commit fc62d0207ae0 ("kprobes: Introduce weak variant of
> kprobe_exceptions_notify()") used the __kprobes annotation to exclude
> kprobe_exceptions_notify from being probed. Since NOKPROBE_SYMBOL() is a
> better way to do this enabling the symbol to be discovered as being
> blacklisted, change over to using NOKPROBE_SYMBOL().
> 

Oops, yes it should be.

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

Thanks,

> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
> ---
>  kernel/kprobes.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> index 699c5bc51a92..b52d952d6d41 100644
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -1740,11 +1740,12 @@ void unregister_kprobes(struct kprobe **kps, int num)
>  }
>  EXPORT_SYMBOL_GPL(unregister_kprobes);
>  
> -int __weak __kprobes kprobe_exceptions_notify(struct notifier_block *self,
> -					      unsigned long val, void *data)
> +int __weak kprobe_exceptions_notify(struct notifier_block *self,
> +					unsigned long val, void *data)
>  {
>  	return NOTIFY_DONE;
>  }
> +NOKPROBE_SYMBOL(kprobe_exceptions_notify);
>  
>  static struct notifier_block kprobe_exceptions_nb = {
>  	.notifier_call = kprobe_exceptions_notify,
> -- 
> 2.11.1
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web