diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /kernel/notifier.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'kernel/notifier.c')
| -rw-r--r-- | kernel/notifier.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/notifier.c b/kernel/notifier.c index 4282c0a40a57..61d5aa5eced3 100644 --- a/kernel/notifier.c +++ b/kernel/notifier.c | |||
| @@ -82,6 +82,14 @@ static int __kprobes notifier_call_chain(struct notifier_block **nl, | |||
| 82 | 82 | ||
| 83 | while (nb && nr_to_call) { | 83 | while (nb && nr_to_call) { |
| 84 | next_nb = rcu_dereference(nb->next); | 84 | next_nb = rcu_dereference(nb->next); |
| 85 | |||
| 86 | #ifdef CONFIG_DEBUG_NOTIFIERS | ||
| 87 | if (unlikely(!func_ptr_is_kernel_text(nb->notifier_call))) { | ||
| 88 | WARN(1, "Invalid notifier called!"); | ||
| 89 | nb = next_nb; | ||
| 90 | continue; | ||
| 91 | } | ||
| 92 | #endif | ||
| 85 | ret = nb->notifier_call(nb, val, v); | 93 | ret = nb->notifier_call(nb, val, v); |
| 86 | 94 | ||
| 87 | if (nr_calls) | 95 | if (nr_calls) |