wpa_supplicant: update to 2.10.
Config changes: CONFIG_DRIVER_MACSEC_LINUX=y (upstream default) CONFIG_MACSEC=y (upstream default) CONFIG_GETRANDOM=y (we have new enough glibc) CONFIG_TDLS=y (upstream default) CONFIG_DPP2=y (upstream default) CONFIG_WEP=y (legacy setups)
This commit is contained in:
Leah Neukirchen
parent
0609700fa6
commit
8a7b769b05
|
|
@ -77,7 +77,7 @@ CONFIG_DRIVER_WIRED=y
|
|||
#CONFIG_DRIVER_MACSEC_QCA=y
|
||||
|
||||
# Driver interface for Linux MACsec drivers
|
||||
#CONFIG_DRIVER_MACSEC_LINUX=y
|
||||
CONFIG_DRIVER_MACSEC_LINUX=y
|
||||
|
||||
# Driver interface for the Broadcom RoboSwitch family
|
||||
#CONFIG_DRIVER_ROBOSWITCH=y
|
||||
|
|
@ -111,6 +111,16 @@ CONFIG_EAP_TTLS=y
|
|||
# EAP-FAST
|
||||
CONFIG_EAP_FAST=y
|
||||
|
||||
# EAP-TEAP
|
||||
# Note: The current EAP-TEAP implementation is experimental and should not be
|
||||
# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number
|
||||
# of conflicting statements and missing details and the implementation has
|
||||
# vendor specific workarounds for those and as such, may not interoperate with
|
||||
# any other implementation. This should not be used for anything else than
|
||||
# experimentation and interoperability testing until those issues has been
|
||||
# resolved.
|
||||
#CONFIG_EAP_TEAP=y
|
||||
|
||||
# EAP-GTC
|
||||
CONFIG_EAP_GTC=y
|
||||
|
||||
|
|
@ -120,6 +130,9 @@ CONFIG_EAP_OTP=y
|
|||
# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
|
||||
#CONFIG_EAP_SIM=y
|
||||
|
||||
# Enable SIM simulator (Milenage) for EAP-SIM
|
||||
#CONFIG_SIM_SIMULATOR=y
|
||||
|
||||
# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
|
||||
#CONFIG_EAP_PSK=y
|
||||
|
||||
|
|
@ -170,7 +183,7 @@ CONFIG_EAP_IKEV2=y
|
|||
#CONFIG_EAP_EKE=y
|
||||
|
||||
# MACsec
|
||||
#CONFIG_MACSEC=y
|
||||
CONFIG_MACSEC=y
|
||||
|
||||
# PKCS#12 (PFX) support (used to read private key and certificate file from
|
||||
# a file that usually has extension .p12 or .pfx)
|
||||
|
|
@ -235,7 +248,7 @@ CONFIG_WPA_CLI_EDIT=y
|
|||
# Simultaneous Authentication of Equals (SAE), WPA3-Personal
|
||||
CONFIG_SAE=y
|
||||
|
||||
# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
|
||||
# Disable scan result processing (ap_scan=1) to save code size by about 1 kB.
|
||||
# This can be used if ap_scan=1 mode is never enabled.
|
||||
#CONFIG_NO_SCAN_PROCESSING=y
|
||||
|
||||
|
|
@ -297,10 +310,6 @@ CONFIG_BACKEND=file
|
|||
# bridge interfaces (commit 'bridge: respect RFC2863 operational state')').
|
||||
#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y
|
||||
|
||||
# IEEE 802.11w (management frame protection), also known as PMF
|
||||
# Driver support is also needed for IEEE 802.11w.
|
||||
CONFIG_IEEE80211W=y
|
||||
|
||||
# Support Operating Channel Validation
|
||||
#CONFIG_OCV=y
|
||||
|
||||
|
|
@ -353,7 +362,7 @@ CONFIG_IEEE80211W=y
|
|||
#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
|
||||
|
||||
# Add support for new DBus control interface
|
||||
# (fi.w1.hostap.wpa_supplicant1)
|
||||
# (fi.w1.wpa_supplicant1)
|
||||
CONFIG_CTRL_IFACE_DBUS_NEW=y
|
||||
|
||||
# Add introspection support for new DBus control interface
|
||||
|
|
@ -460,13 +469,9 @@ CONFIG_NO_RANDOM_POOL=y
|
|||
# Should we attempt to use the getrandom(2) call that provides more reliable
|
||||
# yet secure randomness source than /dev/random on Linux 3.17 and newer.
|
||||
# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
|
||||
#CONFIG_GETRANDOM=y
|
||||
|
||||
# IEEE 802.11n (High Throughput) support (mainly for AP mode)
|
||||
CONFIG_IEEE80211N=y
|
||||
CONFIG_GETRANDOM=y
|
||||
|
||||
# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode)
|
||||
# (depends on CONFIG_IEEE80211N)
|
||||
CONFIG_IEEE80211AC=y
|
||||
|
||||
# Wireless Network Management (IEEE Std 802.11v-2011)
|
||||
|
|
@ -501,7 +506,7 @@ CONFIG_AP=y
|
|||
CONFIG_P2P=y
|
||||
|
||||
# Enable TDLS support
|
||||
#CONFIG_TDLS=y
|
||||
CONFIG_TDLS=y
|
||||
|
||||
# Wi-Fi Display
|
||||
# This can be used to enable Wi-Fi Display extensions for P2P using an external
|
||||
|
|
@ -525,6 +530,8 @@ CONFIG_WIFI_DISPLAY=y
|
|||
#
|
||||
# External password backend for testing purposes (developer use)
|
||||
#CONFIG_EXT_PASSWORD_TEST=y
|
||||
# File-based backend to read passwords from an external file.
|
||||
#CONFIG_EXT_PASSWORD_FILE=y
|
||||
|
||||
# Enable Fast Session Transfer (FST)
|
||||
#CONFIG_FST=y
|
||||
|
|
@ -596,7 +603,33 @@ CONFIG_BGSCAN_SIMPLE=y
|
|||
# Experimental implementation of draft-harkins-owe-07.txt
|
||||
#CONFIG_OWE=y
|
||||
|
||||
# Device Provisioning Protocol (DPP)
|
||||
# This requires CONFIG_IEEE80211W=y to be enabled, too. (see
|
||||
# wpa_supplicant/README-DPP for details)
|
||||
# Device Provisioning Protocol (DPP) (also known as Wi-Fi Easy Connect)
|
||||
CONFIG_DPP=y
|
||||
# DPP version 2 support
|
||||
CONFIG_DPP2=y
|
||||
# DPP version 3 support (experimental and still changing; do not enable for
|
||||
# production use)
|
||||
#CONFIG_DPP3=y
|
||||
|
||||
# Wired equivalent privacy (WEP)
|
||||
# WEP is an obsolete cryptographic data confidentiality algorithm that is not
|
||||
# considered secure. It should not be used for anything anymore. The
|
||||
# functionality needed to use WEP is available in the current wpa_supplicant
|
||||
# release under this optional build parameter. This functionality is subject to
|
||||
# be completely removed in a future release.
|
||||
CONFIG_WEP=y
|
||||
|
||||
# Remove all TKIP functionality
|
||||
# TKIP is an old cryptographic data confidentiality algorithm that is not
|
||||
# considered secure. It should not be used anymore for anything else than a
|
||||
# backwards compatibility option as a group cipher when connecting to APs that
|
||||
# use WPA+WPA2 mixed mode. For now, the default wpa_supplicant build includes
|
||||
# support for this by default, but that functionality is subject to be removed
|
||||
# in the future.
|
||||
#CONFIG_NO_TKIP=y
|
||||
|
||||
# Pre-Association Security Negotiation (PASN)
|
||||
# Experimental implementation based on IEEE P802.11z/D2.6 and the protocol
|
||||
# design is still subject to change. As such, this should not yet be enabled in
|
||||
# production use.
|
||||
#CONFIG_PASN=y
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
From https://w1.fi/security/2019-7/
|
||||
|
||||
From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Thu, 29 Aug 2019 11:52:04 +0300
|
||||
Subject: [PATCH] AP: Silently ignore management frame from unexpected source
|
||||
address
|
||||
|
||||
Do not process any received Management frames with unexpected/invalid SA
|
||||
so that we do not add any state for unexpected STA addresses or end up
|
||||
sending out frames to unexpected destination. This prevents unexpected
|
||||
sequences where an unprotected frame might end up causing the AP to send
|
||||
out a response to another device and that other device processing the
|
||||
unexpected response.
|
||||
|
||||
In particular, this prevents some potential denial of service cases
|
||||
where the unexpected response frame from the AP might result in a
|
||||
connected station dropping its association.
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/ap/drv_callbacks.c | 13 +++++++++++++
|
||||
src/ap/ieee802_11.c | 12 ++++++++++++
|
||||
2 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
|
||||
index 31587685fe3b..34ca379edc3d 100644
|
||||
--- a/src/ap/drv_callbacks.c
|
||||
+++ b/src/ap/drv_callbacks.c
|
||||
@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
|
||||
"hostapd_notif_assoc: Skip event with no address");
|
||||
return -1;
|
||||
}
|
||||
+
|
||||
+ if (is_multicast_ether_addr(addr) ||
|
||||
+ is_zero_ether_addr(addr) ||
|
||||
+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
|
||||
+ /* Do not process any frames with unexpected/invalid SA so that
|
||||
+ * we do not add any state for unexpected STA addresses or end
|
||||
+ * up sending out frames to unexpected destination. */
|
||||
+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
|
||||
+ " in received indication - ignore this indication silently",
|
||||
+ __func__, MAC2STR(addr));
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
random_add_randomness(addr, ETH_ALEN);
|
||||
|
||||
hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
|
||||
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
|
||||
index c85a28db44b7..e7065372e158 100644
|
||||
--- a/src/ap/ieee802_11.c
|
||||
+++ b/src/ap/ieee802_11.c
|
||||
@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
|
||||
fc = le_to_host16(mgmt->frame_control);
|
||||
stype = WLAN_FC_GET_STYPE(fc);
|
||||
|
||||
+ if (is_multicast_ether_addr(mgmt->sa) ||
|
||||
+ is_zero_ether_addr(mgmt->sa) ||
|
||||
+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
|
||||
+ /* Do not process any frames with unexpected/invalid SA so that
|
||||
+ * we do not add any state for unexpected STA addresses or end
|
||||
+ * up sending out frames to unexpected destination. */
|
||||
+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
|
||||
+ " in received frame - ignore this frame silently",
|
||||
+ MAC2STR(mgmt->sa));
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
if (stype == WLAN_FC_STYPE_BEACON) {
|
||||
handle_beacon(hapd, mgmt, len, fi);
|
||||
return 1;
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
Patch from https://w1.fi/security/2020-2/
|
||||
|
||||
From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <jouni@codeaurora.org>
|
||||
Date: Mon, 9 Nov 2020 11:43:12 +0200
|
||||
Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group
|
||||
client
|
||||
|
||||
Parsing and copying of WPS secondary device types list was verifying
|
||||
that the contents is not too long for the internal maximum in the case
|
||||
of WPS messages, but similar validation was missing from the case of P2P
|
||||
group information which encodes this information in a different
|
||||
attribute. This could result in writing beyond the memory area assigned
|
||||
for these entries and corrupting memory within an instance of struct
|
||||
p2p_device. This could result in invalid operations and unexpected
|
||||
behavior when trying to free pointers from that corrupted memory.
|
||||
|
||||
Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269
|
||||
Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers")
|
||||
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
|
||||
---
|
||||
src/p2p/p2p.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
|
||||
index 74b7b52ae05c..5cbfc217fc1f 100644
|
||||
--- a/src/p2p/p2p.c
|
||||
+++ a/src/p2p/p2p.c
|
||||
@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev,
|
||||
dev->info.config_methods = cli->config_methods;
|
||||
os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
|
||||
dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
|
||||
+ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN)
|
||||
+ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
|
||||
os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
|
||||
dev->info.wps_sec_dev_type_list_len);
|
||||
}
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
From https://w1.fi/security/2020-1/
|
||||
|
||||
From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <jouni@codeaurora.org>
|
||||
Date: Wed, 3 Jun 2020 23:17:35 +0300
|
||||
Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
|
||||
other networks
|
||||
|
||||
The UPnP Device Architecture 2.0 specification errata ("UDA errata
|
||||
16-04-2020.docx") addresses a problem with notifications being allowed
|
||||
to go out to other domains by disallowing such cases. Do such filtering
|
||||
for the notification callback URLs to avoid undesired connections to
|
||||
external networks based on subscriptions that any device in the local
|
||||
network could request when WPS support for external registrars is
|
||||
enabled (the upnp_iface parameter in hostapd configuration).
|
||||
|
||||
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
|
||||
---
|
||||
src/wps/wps_er.c | 2 +-
|
||||
src/wps/wps_upnp.c | 38 ++++++++++++++++++++++++++++++++++++--
|
||||
src/wps/wps_upnp_i.h | 3 ++-
|
||||
3 files changed, 39 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
|
||||
index 6bded14327f8..31d2e50e4cff 100644
|
||||
--- a/src/wps/wps_er.c
|
||||
+++ b/src/wps/wps_er.c
|
||||
@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter)
|
||||
"with %s", filter);
|
||||
}
|
||||
if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text,
|
||||
- er->mac_addr)) {
|
||||
+ NULL, er->mac_addr)) {
|
||||
wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
|
||||
"for %s. Does it have IP address?", er->ifname);
|
||||
wps_er_deinit(er, NULL, NULL);
|
||||
diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
|
||||
index 6e10e4bc0c3f..7d4b7439940e 100644
|
||||
--- a/src/wps/wps_upnp.c
|
||||
+++ b/src/wps/wps_upnp.c
|
||||
@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s)
|
||||
}
|
||||
|
||||
|
||||
+static int local_network_addr(struct upnp_wps_device_sm *sm,
|
||||
+ struct sockaddr_in *addr)
|
||||
+{
|
||||
+ return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
|
||||
+ (sm->ip_addr & sm->netmask.s_addr);
|
||||
+}
|
||||
+
|
||||
+
|
||||
/* subscr_addr_add_url -- add address(es) for one url to subscription */
|
||||
static void subscr_addr_add_url(struct subscription *s, const char *url,
|
||||
size_t url_len)
|
||||
@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
|
||||
|
||||
for (rp = result; rp; rp = rp->ai_next) {
|
||||
struct subscr_addr *a;
|
||||
+ struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr;
|
||||
|
||||
/* Limit no. of address to avoid denial of service attack */
|
||||
if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) {
|
||||
@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
|
||||
break;
|
||||
}
|
||||
|
||||
+ if (!local_network_addr(s->sm, addr)) {
|
||||
+ wpa_printf(MSG_INFO,
|
||||
+ "WPS UPnP: Ignore a delivery URL that points to another network %s",
|
||||
+ inet_ntoa(addr->sin_addr));
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
a = os_zalloc(sizeof(*a) + alloc_len);
|
||||
if (a == NULL)
|
||||
break;
|
||||
@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN])
|
||||
* @net_if: Selected network interface name
|
||||
* @ip_addr: Buffer for returning IP address in network byte order
|
||||
* @ip_addr_text: Buffer for returning a pointer to allocated IP address text
|
||||
+ * @netmask: Buffer for returning netmask or %NULL if not needed
|
||||
* @mac: Buffer for returning MAC address
|
||||
* Returns: 0 on success, -1 on failure
|
||||
*/
|
||||
int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
|
||||
- u8 mac[ETH_ALEN])
|
||||
+ struct in_addr *netmask, u8 mac[ETH_ALEN])
|
||||
{
|
||||
struct ifreq req;
|
||||
int sock = -1;
|
||||
@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
|
||||
in_addr.s_addr = *ip_addr;
|
||||
os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr));
|
||||
|
||||
+ if (netmask) {
|
||||
+ os_memset(&req, 0, sizeof(req));
|
||||
+ os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
|
||||
+ if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) {
|
||||
+ wpa_printf(MSG_ERROR,
|
||||
+ "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)",
|
||||
+ errno, strerror(errno));
|
||||
+ goto fail;
|
||||
+ }
|
||||
+ addr = (struct sockaddr_in *) &req.ifr_netmask;
|
||||
+ netmask->s_addr = addr->sin_addr.s_addr;
|
||||
+ }
|
||||
+
|
||||
#ifdef __linux__
|
||||
os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
|
||||
if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) {
|
||||
@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if)
|
||||
|
||||
/* Determine which IP and mac address we're using */
|
||||
if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text,
|
||||
- sm->mac_addr)) {
|
||||
+ &sm->netmask, sm->mac_addr)) {
|
||||
wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
|
||||
"for %s. Does it have IP address?", net_if);
|
||||
goto fail;
|
||||
}
|
||||
+ wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr "
|
||||
+ MACSTR,
|
||||
+ sm->ip_addr_text, inet_ntoa(sm->netmask),
|
||||
+ MAC2STR(sm->mac_addr));
|
||||
|
||||
/* Listen for incoming TCP connections so that others
|
||||
* can fetch our "xml files" from us.
|
||||
diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h
|
||||
index e87a93232df1..6ead7b4e9a30 100644
|
||||
--- a/src/wps/wps_upnp_i.h
|
||||
+++ b/src/wps/wps_upnp_i.h
|
||||
@@ -128,6 +128,7 @@ struct upnp_wps_device_sm {
|
||||
u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */
|
||||
char *ip_addr_text; /* IP address of network i.f. we use */
|
||||
unsigned ip_addr; /* IP address of network i.f. we use (host order) */
|
||||
+ struct in_addr netmask;
|
||||
int multicast_sd; /* send multicast messages over this socket */
|
||||
int ssdp_sd; /* receive discovery UPD packets on socket */
|
||||
int ssdp_sd_registered; /* nonzero if we must unregister */
|
||||
@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm,
|
||||
const u8 uuid[UUID_LEN]);
|
||||
void subscr_addr_delete(struct subscr_addr *a);
|
||||
int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
|
||||
- u8 mac[ETH_ALEN]);
|
||||
+ struct in_addr *netmask, u8 mac[ETH_ALEN]);
|
||||
|
||||
/* wps_upnp_ssdp.c */
|
||||
void msearchreply_state_machine_stop(struct advertisement_state_machine *a);
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <jouni@codeaurora.org>
|
||||
Date: Wed, 3 Jun 2020 22:41:02 +0300
|
||||
Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL
|
||||
path
|
||||
|
||||
More than about 700 character URL ended up overflowing the wpabuf used
|
||||
for building the event notification and this resulted in the wpabuf
|
||||
buffer overflow checks terminating the hostapd process. Fix this by
|
||||
allocating the buffer to be large enough to contain the full URL path.
|
||||
However, since that around 700 character limit has been the practical
|
||||
limit for more than ten years, start explicitly enforcing that as the
|
||||
limit or the callback URLs since any longer ones had not worked before
|
||||
and there is no need to enable them now either.
|
||||
|
||||
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
|
||||
---
|
||||
src/wps/wps_upnp.c | 9 +++++++--
|
||||
src/wps/wps_upnp_event.c | 3 ++-
|
||||
2 files changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
|
||||
index 7d4b7439940e..ab685d52ecab 100644
|
||||
--- a/src/wps/wps_upnp.c
|
||||
+++ b/src/wps/wps_upnp.c
|
||||
@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
|
||||
int rerr;
|
||||
size_t host_len, path_len;
|
||||
|
||||
- /* url MUST begin with http: */
|
||||
- if (url_len < 7 || os_strncasecmp(url, "http://", 7))
|
||||
+ /* URL MUST begin with HTTP scheme. In addition, limit the length of
|
||||
+ * the URL to 700 characters which is around the limit that was
|
||||
+ * implicitly enforced for more than 10 years due to a bug in
|
||||
+ * generating the event messages. */
|
||||
+ if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) {
|
||||
+ wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL");
|
||||
goto fail;
|
||||
+ }
|
||||
url += 7;
|
||||
url_len -= 7;
|
||||
|
||||
diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
|
||||
index d7e6edcc6503..08a23612f338 100644
|
||||
--- a/src/wps/wps_upnp_event.c
|
||||
+++ b/src/wps/wps_upnp_event.c
|
||||
@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e)
|
||||
struct wpabuf *buf;
|
||||
char *b;
|
||||
|
||||
- buf = wpabuf_alloc(1000 + wpabuf_len(e->data));
|
||||
+ buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) +
|
||||
+ wpabuf_len(e->data));
|
||||
if (buf == NULL)
|
||||
return NULL;
|
||||
wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path);
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <jouni@codeaurora.org>
|
||||
Date: Thu, 4 Jun 2020 21:24:04 +0300
|
||||
Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more
|
||||
properly
|
||||
|
||||
While it is appropriate to try to retransmit the event to another
|
||||
callback URL on a failure to initiate the HTTP client connection, there
|
||||
is no point in trying the exact same operation multiple times in a row.
|
||||
Replve the event_retry() calls with event_addr_failure() for these cases
|
||||
to avoid busy loops trying to repeat the same failing operation.
|
||||
|
||||
These potential busy loops would go through eloop callbacks, so the
|
||||
process is not completely stuck on handling them, but unnecessary CPU
|
||||
would be used to process the continues retries that will keep failing
|
||||
for the same reason.
|
||||
|
||||
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
|
||||
---
|
||||
src/wps/wps_upnp_event.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
|
||||
index 08a23612f338..c0d9e41d9a38 100644
|
||||
--- a/src/wps/wps_upnp_event.c
|
||||
+++ b/src/wps/wps_upnp_event.c
|
||||
@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s)
|
||||
|
||||
buf = event_build_message(e);
|
||||
if (buf == NULL) {
|
||||
- event_retry(e, 0);
|
||||
+ event_addr_failure(e);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s)
|
||||
event_http_cb, e);
|
||||
if (e->http_event == NULL) {
|
||||
wpabuf_free(buf);
|
||||
- event_retry(e, 0);
|
||||
+ event_addr_failure(e);
|
||||
return -1;
|
||||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
From 23d87687c2428f3b94865580b0d33e05c03e6756 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Wang <matthewmwang@chromium.org>
|
||||
Date: Fri, 11 Oct 2019 13:49:25 -0700
|
||||
Subject: dbus: Move roam metrics to the correct interface
|
||||
|
||||
These properties were in the wpas_dbus_bss_properties array when they
|
||||
should have been in the wpas_dbus_interface_properties array. Move them
|
||||
to the right place. This is the logical location for these properties
|
||||
and it matches both the other parts of the implementation (e.g., being
|
||||
in enum wpas_dbus_prop, not in enum wpas_dbus_bss_prop) and what
|
||||
was originally documented for the interface in dbus.doxygen.
|
||||
|
||||
Fixes: 2bbad1c7c9cb ("dbus: Export roam time, roam complete, and session length")
|
||||
Fixes: 80d06d0ca9f3 ("dbus: Export BSS Transition Management status")
|
||||
Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
|
||||
---
|
||||
wpa_supplicant/dbus/dbus_new.c | 48 +++++++++++++++++++++---------------------
|
||||
1 file changed, 24 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
|
||||
index 5e6b522..e9e77bd 100644
|
||||
--- a/wpa_supplicant/dbus/dbus_new.c
|
||||
+++ b/wpa_supplicant/dbus/dbus_new.c
|
||||
@@ -2855,30 +2855,6 @@ static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = {
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
- {
|
||||
- "RoamTime", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
- wpas_dbus_getter_roam_time,
|
||||
- NULL,
|
||||
- NULL
|
||||
- },
|
||||
- {
|
||||
- "RoamComplete", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
|
||||
- wpas_dbus_getter_roam_complete,
|
||||
- NULL,
|
||||
- NULL
|
||||
- },
|
||||
- {
|
||||
- "SessionLength", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
- wpas_dbus_getter_session_length,
|
||||
- NULL,
|
||||
- NULL
|
||||
- },
|
||||
- {
|
||||
- "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
- wpas_dbus_getter_bss_tm_status,
|
||||
- NULL,
|
||||
- NULL
|
||||
- },
|
||||
{ NULL, NULL, NULL, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
@@ -3786,6 +3762,30 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
+ {
|
||||
+ "RoamTime", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
+ wpas_dbus_getter_roam_time,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ },
|
||||
+ {
|
||||
+ "RoamComplete", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
|
||||
+ wpas_dbus_getter_roam_complete,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ },
|
||||
+ {
|
||||
+ "SessionLength", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
+ wpas_dbus_getter_session_length,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ },
|
||||
+ {
|
||||
+ "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
+ wpas_dbus_getter_bss_tm_status,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ },
|
||||
#ifdef CONFIG_MESH
|
||||
{ "MeshPeers", WPAS_DBUS_NEW_IFACE_MESH, "aay",
|
||||
wpas_dbus_getter_mesh_peers,
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
# Template file for 'wpa_supplicant'
|
||||
pkgname=wpa_supplicant
|
||||
version=2.9
|
||||
revision=6
|
||||
version=2.10
|
||||
revision=1
|
||||
build_wrksrc="$pkgname"
|
||||
short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
|
||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||
license="BSD-3-Clause"
|
||||
homepage="http://w1.fi/wpa_supplicant/"
|
||||
distfiles="http://w1.fi/releases/${pkgname}-${version}.tar.gz"
|
||||
checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
|
||||
checksum=20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f
|
||||
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
|
||||
|
|
@ -21,15 +21,14 @@ pre_build() {
|
|||
cp -f ${FILESDIR}/config .config
|
||||
|
||||
if [ "$build_option_dbus" ]; then
|
||||
sed -i 's, -u, -uq,' dbus/*.service.in
|
||||
vsed -i -e 's, -u, -uq,' dbus/*.service.in
|
||||
else
|
||||
sed -i 's|#\{0,1\}\(CONFIG_CTRL_IFACE_DBUS\)=\(.*\)|\1=|' .config
|
||||
sed -i 's|#\{0,1\}\(CONFIG_CTRL_IFACE_DBUS_NEW\)=\(.*\)|\1=|' .config
|
||||
sed -i 's|#\{0,1\}\(CONFIG_CTRL_IFACE_DBUS_INTRO\)=\(.*\)|\1=|' .config
|
||||
vsed -i -e 's|#\{0,1\}\(CONFIG_CTRL_IFACE_DBUS_NEW\)=\(.*\)|\1=|' .config
|
||||
vsed -i -e 's|#\{0,1\}\(CONFIG_CTRL_IFACE_DBUS_INTRO\)=\(.*\)|\1=|' .config
|
||||
fi
|
||||
|
||||
if [ "$build_option_readline" ]; then
|
||||
sed -i 's|#\{0,1\}\(CONFIG_READLINE\)=\(.*\)|\1=y|' .config
|
||||
vsed -i -e 's|#\{0,1\}\(CONFIG_READLINE\)=\(.*\)|\1=y|' .config
|
||||
fi
|
||||
}
|
||||
do_build() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue