ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-03-11 06:54:21 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

hostapd: fix rare crash with AP+STA and ACS enabled

Browse Source 
Ensure that the iface disable in uc_hostapd_iface_start also clears the ACS
state.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit f1bb528ae7631c60b95499b7e8a1948c3e6a42f0)
This commit is contained in:
Felix Fietkau 2023-09-25 15:36:29 +02:00
parent f4e4943d1a
commit 849f0ea65c
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/network/services/hostapd/src/src/ap/ucode.c
View File

@ -465,17 +465,10 @@ uc_hostapd_bss_ctrl(uc_vm_t *vm, size_t nargs)
return ucv_string_new_length(reply, reply_len); return ucv_string_new_length(reply, reply_len);
} }
static uc_value_t * static void
uc_hostapd_iface_stop(uc_vm_t *vm, size_t nargs) 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) { switch (iface->state) {
case HAPD_IFACE_ENABLED:
case HAPD_IFACE_DISABLED: case HAPD_IFACE_DISABLED:
break; break;
#ifdef CONFIG_ACS #ifdef CONFIG_ACS
@ -488,9 +481,19 @@ uc_hostapd_iface_stop(uc_vm_t *vm, size_t nargs)
hostapd_disable_iface(iface); hostapd_disable_iface(iface);
break; 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) if (iface->state != HAPD_IFACE_ENABLED)
hostapd_disable_iface(iface); uc_hostapd_disable_iface(iface);
for (i = 0; i < iface->num_bss; i++) { for (i = 0; i < iface->num_bss; i++) {
struct hostapd_data *hapd = iface->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: out:
switch (iface->state) { switch (iface->state) {
case HAPD_IFACE_DISABLED:
break;
case HAPD_IFACE_ENABLED: case HAPD_IFACE_ENABLED:
if (!hostapd_is_dfs_required(iface) || if (!hostapd_is_dfs_required(iface) ||
hostapd_is_dfs_chan_available(iface)) hostapd_is_dfs_chan_available(iface))
@ -570,7 +571,7 @@ out:
wpa_printf(MSG_INFO, "DFS CAC required on new channel, restart interface"); wpa_printf(MSG_INFO, "DFS CAC required on new channel, restart interface");
/* fallthrough */ /* fallthrough */
default: default:
hostapd_disable_iface(iface); uc_hostapd_disable_iface(iface);
break; break;
} }