From bb4e19e3f4c9d1973279b3b768bc0539ee7cb962 Mon Sep 17 00:00:00 2001 From: Sunil Dutt Date: Thu, 14 Jan 2016 18:25:57 +0530 Subject: [PATCH] hostapd: Skip hostapd ACL check for drivers supporting ACL offload Commit 0603bcb7fe8babf183362518238c142afe8e2036 ('hostapd: Process MAC ACLs on a station association event (SME in driver)') processes MAC ACL on a station association event for drivers which use AP SME offload but does not consider the scenario where the drivers offload ACL. This can result in station disconnection, though the driver accepts the connection. Address this by avoiding the hostapd ACL check for the drivers offloading MAC ACL. Signed-off-by: Jouni Malinen --- src/ap/drv_callbacks.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index 02557abbb..3552b3e0d 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -116,8 +116,15 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, } sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS | WLAN_STA_WPS2); - res = hostapd_check_acl(hapd, addr, NULL); - if (res != HOSTAPD_ACL_ACCEPT) { + /* + * ACL configurations to the drivers (implementing AP SME and ACL + * offload) without hostapd's knowledge, can result in a disconnection + * though the driver accepts the connection. Skip the hostapd check for + * ACL if the driver supports ACL offload to avoid potentially + * conflicting ACL rules. + */ + if (hapd->iface->drv_max_acl_mac_addrs == 0 && + hostapd_check_acl(hapd, addr, NULL) != HOSTAPD_ACL_ACCEPT) { wpa_printf(MSG_INFO, "STA " MACSTR " not allowed to connect", MAC2STR(addr)); reason = WLAN_REASON_UNSPECIFIED;