Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b40a2cb6 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

kprobes, notifier: Use NOKPROBE_SYMBOL macro in notifier 



Use NOKPROBE_SYMBOL macro to protect functions from
kprobes instead of __kprobes annotation in notifier.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reviewed-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20140417081835.26341.56128.stgit@ltc230.yrl.intra.hitachi.co.jp


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3da0f180

kernel/notifier.c

+13 −9
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int notifier_chain_unregister(struct notifier_block **nl, 
 *	@returns:	notifier_call_chain returns the value returned by the

 *			last notifier function called.

 */

static int __kprobes notifier_call_chain(struct notifier_block **nl,

static int notifier_call_chain(struct notifier_block **nl,

			       unsigned long val, void *v,

			       int nr_to_call, int *nr_calls)

{
@@ -102,6 +102,7 @@ static int __kprobes notifier_call_chain(struct notifier_block **nl, 
	}

	return ret;

}

NOKPROBE_SYMBOL(notifier_call_chain);



/*

 *	Atomic notifier chain routines.  Registration and unregistration
@@ -172,7 +173,7 @@ EXPORT_SYMBOL_GPL(atomic_notifier_chain_unregister); 
 *	Otherwise the return value is the return value

 *	of the last notifier function called.

 */

int __kprobes __atomic_notifier_call_chain(struct atomic_notifier_head *nh,

int __atomic_notifier_call_chain(struct atomic_notifier_head *nh,

				 unsigned long val, void *v,

				 int nr_to_call, int *nr_calls)

{
@@ -184,13 +185,15 @@ int __kprobes __atomic_notifier_call_chain(struct atomic_notifier_head *nh, 
	return ret;

}

EXPORT_SYMBOL_GPL(__atomic_notifier_call_chain);

NOKPROBE_SYMBOL(__atomic_notifier_call_chain);



int __kprobes atomic_notifier_call_chain(struct atomic_notifier_head *nh,

int atomic_notifier_call_chain(struct atomic_notifier_head *nh,

			       unsigned long val, void *v)

{

	return __atomic_notifier_call_chain(nh, val, v, -1, NULL);

}

EXPORT_SYMBOL_GPL(atomic_notifier_call_chain);

NOKPROBE_SYMBOL(atomic_notifier_call_chain);



/*

 *	Blocking notifier chain routines.  All access to the chain is
@@ -527,7 +530,7 @@ EXPORT_SYMBOL_GPL(srcu_init_notifier_head); 


static ATOMIC_NOTIFIER_HEAD(die_chain);



int notrace __kprobes notify_die(enum die_val val, const char *str,

int notrace notify_die(enum die_val val, const char *str,

	       struct pt_regs *regs, long err, int trap, int sig)

{

	struct die_args args = {
@@ -540,6 +543,7 @@ int notrace __kprobes notify_die(enum die_val val, const char *str, 
	};

	return atomic_notifier_call_chain(&die_chain, val, &args);

}

NOKPROBE_SYMBOL(notify_die);



int register_die_notifier(struct notifier_block *nb)

{