1 files changed, 4 insertions, 3 deletions

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index e6c8382c79ba..ccf70bed0d0c 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -527,11 +527,12 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,
                  * gets dereferenced.
                  */
                 spin_lock_bh(&bat_priv->gw.list_lock);
-                hlist_del_init_rcu(&gw_node->list);
+                if (!hlist_unhashed(&gw_node->list)) {
+                        hlist_del_init_rcu(&gw_node->list);
+                        batadv_gw_node_free_ref(gw_node);
+                }
                 spin_unlock_bh(&bat_priv->gw.list_lock);
 
-                batadv_gw_node_free_ref(gw_node);
-
                 curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
                 if (gw_node == curr_gw)
                         batadv_gw_reselect(bat_priv);