[openwrt/openwrt] hostapd: fix rare crash with AP+STA and ACS enabled

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/849f0ea65c8fa99ce01ea87450daf628c2628a01

commit 849f0ea65c8fa99ce01ea87450daf628c2628a01
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Sep 25 15:36:29 2023 +0200

    hostapd: fix rare crash with AP+STA and ACS enabled
    
    Ensure that the iface disable in uc_hostapd_iface_start also clears the ACS
    state.
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
    (cherry picked from commit f1bb528ae7631c60b95499b7e8a1948c3e6a42f0)
---
 .../network/services/hostapd/src/src/ap/ucode.c    | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/package/network/services/hostapd/src/src/ap/ucode.c b/package/network/services/hostapd/src/src/ap/ucode.c
index ac3222b03f..af97091be5 100644
--- a/package/network/services/hostapd/src/src/ap/ucode.c
+++ b/package/network/services/hostapd/src/src/ap/ucode.c
@@ -465,17 +465,10 @@ uc_hostapd_bss_ctrl(uc_vm_t *vm, size_t nargs)
 	return ucv_string_new_length(reply, reply_len);
 }
 
-static uc_value_t *
-uc_hostapd_iface_stop(uc_vm_t *vm, size_t nargs)
+static void
+uc_hostapd_disable_iface(struct hostapd_iface *iface)
 {
-	struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
-	int i;
-
-	if (!iface)
-		return NULL;
-
 	switch (iface->state) {
-	case HAPD_IFACE_ENABLED:
 	case HAPD_IFACE_DISABLED:
 		break;
 #ifdef CONFIG_ACS
@@ -488,9 +481,19 @@ uc_hostapd_iface_stop(uc_vm_t *vm, size_t nargs)
 		hostapd_disable_iface(iface);
 		break;
 	}
+}
+
+static uc_value_t *
+uc_hostapd_iface_stop(uc_vm_t *vm, size_t nargs)
+{
+	struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
+	int i;
+
+	if (!iface)
+		return NULL;
 
 	if (iface->state != HAPD_IFACE_ENABLED)
-		hostapd_disable_iface(iface);
+		uc_hostapd_disable_iface(iface);
 
 	for (i = 0; i < iface->num_bss; i++) {
 		struct hostapd_data *hapd = iface->bss[i];
@@ -561,8 +564,6 @@ uc_hostapd_iface_start(uc_vm_t *vm, size_t nargs)
 
 out:
 	switch (iface->state) {
-	case HAPD_IFACE_DISABLED:
-		break;
 	case HAPD_IFACE_ENABLED:
 		if (!hostapd_is_dfs_required(iface) ||
 			hostapd_is_dfs_chan_available(iface))
@@ -570,7 +571,7 @@ out:
 		wpa_printf(MSG_INFO, "DFS CAC required on new channel, restart interface");
 		/* fallthrough */
 	default:
-		hostapd_disable_iface(iface);
+		uc_hostapd_disable_iface(iface);
 		break;
 	}