mac80211: fix deauth before assoc

[safe/jmp/linux-2.6] / kernel / notifier.c

diff --git a/kernel/notifier.c b/kernel/notifier.c
index 143fdd7..2488ba7 100644 (file)
--- a/kernel/notifier.c
+++ b/kernel/notifier.c
@@ -21,10 +21,6 @@ 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;
@@ -38,10 +34,6 @@ 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;
@@ -86,13 +78,13 @@ static int __kprobes notifier_call_chain(struct notifier_block **nl,
        int ret = NOTIFY_DONE;
        struct notifier_block *nb, *next_nb;
 
-       nb = rcu_dereference(*nl);
+       nb = rcu_dereference_raw(*nl);
 
        while (nb && nr_to_call) {
-               next_nb = rcu_dereference(nb->next);
+               next_nb = rcu_dereference_raw(nb->next);
 
 #ifdef CONFIG_DEBUG_NOTIFIERS
-               if (!kernel_text_address((unsigned long)nb->notifier_call)) {
+               if (unlikely(!func_ptr_is_kernel_text(nb->notifier_call))) {
                        WARN(1, "Invalid notifier called!");
                        nb = next_nb;
                        continue;
@@ -317,7 +309,7 @@ int __blocking_notifier_call_chain(struct blocking_notifier_head *nh,
         * racy then it does not matter what the result of the test
         * is, we re-check the list after having taken the lock anyway:
         */
-       if (rcu_dereference(nh->head)) {
+       if (rcu_dereference_raw(nh->head)) {
                down_read(&nh->rwsem);
                ret = notifier_call_chain(&nh->head, val, v, nr_to_call,
                                        nr_calls);
@@ -566,7 +558,7 @@ EXPORT_SYMBOL(unregister_reboot_notifier);
 
 static ATOMIC_NOTIFIER_HEAD(die_chain);
 
-int notify_die(enum die_val val, const char *str,
+int notrace __kprobes notify_die(enum die_val val, const char *str,
               struct pt_regs *regs, long err, int trap, int sig)
 {
        struct die_args args = {