From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 4 Apr 2024 10:52:12 +0000 (+0200)
Subject: Cancel channel_list_update_timeout() in hostapd_cleanup_iface_partial()
X-Git-Tag: hostap_2_11~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1cd3fe3cd9c205f8be2e19a3d67a2cd8da9c524;p=thirdparty%2Fhostap.git

Cancel channel_list_update_timeout() in hostapd_cleanup_iface_partial()

This fixes a crash when disabling an interface during channel list
update.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 07bbf29de..c08be0a0d 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -685,6 +685,7 @@ static void sta_track_deinit(struct hostapd_iface *iface)
 void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
 {
 	wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
+	eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
 #ifdef NEED_AP_MLME
 	hostapd_stop_setup_timers(iface);
 #endif /* NEED_AP_MLME */
@@ -714,7 +715,6 @@ void hostapd_cleanup_iface_partial(struct hostapd_iface *iface)
 static void hostapd_cleanup_iface(struct hostapd_iface *iface)
 {
 	wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface);
-	eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
 	eloop_cancel_timeout(hostapd_interface_setup_failure_handler, iface,
 			     NULL);