Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'core/signal', 'core/urgent' and 'core/xen' into core/core

2008-11-24 17:44:55 +01:00
parent ed313489ba 6003ab0bad 42569c3991 7918baa555 29cbda77a6 2b5fe6de58 b0788caf7a 8dd2337470
commit b19b3c74c7
28 changed files with 315 additions and 267 deletions
@@ -82,6 +82,14 @@ static int __kprobes notifier_call_chain(struct notifier_block **nl,

 	while (nb && nr_to_call) {
 		next_nb = rcu_dereference(nb->next);
+
+#ifdef CONFIG_DEBUG_NOTIFIERS
+		if (unlikely(!func_ptr_is_kernel_text(nb->notifier_call))) {
+			WARN(1, "Invalid notifier called!");
+			nb = next_nb;
+			continue;
+		}
+#endif
 		ret = nb->notifier_call(nb, val, v);

 		if (nr_calls)