Commit 5f6bee34 authored Mar 08, 2017 by Naveen N. Rao Committed by Arnaldo Carvalho de Melo Mar 14, 2017

kprobes: Convert kprobe_exceptions_notify to use NOKPROBE_SYMBOL

commit fc62d020 ("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>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/3f25bf400da5c222cd9b10eec6ded2d6b58209f8.1488991670.git.naveen.n.rao@linux.vnet.ibm.com

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent c1ac094d

kernel/kprobes.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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,
		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,