summaryrefslogtreecommitdiff
path: root/kernel/notifier.c
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-08-15 22:29:38 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-09-10 07:08:50 (GMT)
commit1b2439dbb703ae8d95a9ce7ece6b7800b80f41f0 (patch)
tree63c6c105b86ce45ca010dca4bd501a924afd05d1 /kernel/notifier.c
parentb09c3e3f1710b554348c98e78fbf4a661918779a (diff)
downloadlinux-3.10-1b2439dbb703ae8d95a9ce7ece6b7800b80f41f0.zip
linux-3.10-1b2439dbb703ae8d95a9ce7ece6b7800b80f41f0.tar.gz
linux-3.10-1b2439dbb703ae8d95a9ce7ece6b7800b80f41f0.tar.bz2
debug: add notifier chain debugging
during some development we suspected a case where we left something in a notifier chain that was from a module that was unloaded already... and that sort of thing is rather hard to track down. This patch adds a very simple sanity check (which isn't all that expensive) to make sure the notifier we're about to call is actually from either the kernel itself of from a still-loaded module, avoiding a hard-to-chase-down crash. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/notifier.c')
-rw-r--r--kernel/notifier.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/kernel/notifier.c b/kernel/notifier.c
index 823be11..143fdd7 100644
--- a/kernel/notifier.c
+++ b/kernel/notifier.c
@@ -21,6 +21,10 @@ BLOCKING_NOTIFIER_HEAD(reboot_notifier_list);
static int notifier_chain_register(struct notifier_block **nl,
struct notifier_block *n)
{
+ if (!kernel_text_address((unsigned long)n->notifier_call)) {
+ WARN(1, "Invalid notifier registered!");
+ return 0;
+ }
while ((*nl) != NULL) {
if (n->priority > (*nl)->priority)
break;
@@ -34,6 +38,10 @@ static int notifier_chain_register(struct notifier_block **nl,
static int notifier_chain_cond_register(struct notifier_block **nl,
struct notifier_block *n)
{
+ if (!kernel_text_address((unsigned long)n->notifier_call)) {
+ WARN(1, "Invalid notifier registered!");
+ return 0;
+ }
while ((*nl) != NULL) {
if ((*nl) == n)
return 0;
@@ -82,6 +90,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 (!kernel_text_address((unsigned long)nb->notifier_call)) {
+ WARN(1, "Invalid notifier called!");
+ nb = next_nb;
+ continue;
+ }
+#endif
ret = nb->notifier_call(nb, val, v);
if (nr_calls)