1 files changed, 16 insertions, 1 deletions

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 873fb3d8e56f..c7aafc7c5ed4 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -137,10 +137,22 @@ static void tt_local_entry_free_ref(struct tt_local_entry *tt_local_entry)
                 kfree_rcu(tt_local_entry, rcu);
 }
 
+static void tt_global_entry_free_rcu(struct rcu_head *rcu)
+{
+        struct tt_global_entry *tt_global_entry;
+
+        tt_global_entry = container_of(rcu, struct tt_global_entry, rcu);
+
+        if (tt_global_entry->orig_node)
+                orig_node_free_ref(tt_global_entry->orig_node);
+
+        kfree(tt_global_entry);
+}
+
 static void tt_global_entry_free_ref(struct tt_global_entry *tt_global_entry)
 {
         if (atomic_dec_and_test(&tt_global_entry->refcount))
-                kfree_rcu(tt_global_entry, rcu);
+                call_rcu(&tt_global_entry->rcu, tt_global_entry_free_rcu);
 }
 
 static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr,
@@ -710,6 +722,9 @@ void tt_global_del_orig(struct bat_priv *bat_priv,
         struct hlist_head *head;
         spinlock_t *list_lock; /* protects write access to the hash lists */
 
+        if (!hash)
+                return;
+
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
                 list_lock = &hash->list_locks[i];