summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/notifier.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/kernel/notifier.c b/kernel/notifier.c
index 823be11584ef..143fdd77dbf7 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)
OpenPOWER on IntegriCloud