hostapd-40mhz: init at 2.9
This commit is contained in:
parent
57a8c45516
commit
fef77359c9
|
@ -0,0 +1,150 @@
|
||||||
|
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
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
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
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
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
|
||||||
|
|
11
sakamoto/hostapd-40mhz/40mhz.patch
Normal file
11
sakamoto/hostapd-40mhz/40mhz.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/src/ap/hw_features.c 2021-06-08 21:57:10.333932391 +0200
|
||||||
|
+++ b/src/ap/hw_features.c 2021-06-08 22:00:14.910183739 +0200
|
||||||
|
@@ -310,6 +310,7 @@
|
||||||
|
wpa_scan_results_free(scan_res);
|
||||||
|
|
||||||
|
iface->secondary_ch = iface->conf->secondary_channel;
|
||||||
|
+ oper40=1;
|
||||||
|
if (!oper40) {
|
||||||
|
wpa_printf(MSG_INFO, "20/40 MHz operation not permitted on "
|
||||||
|
"channel pri=%d sec=%d based on overlapping BSSes",
|
||||||
|
|
115
sakamoto/hostapd-40mhz/APKBUILD
Normal file
115
sakamoto/hostapd-40mhz/APKBUILD
Normal file
|
@ -0,0 +1,115 @@
|
||||||
|
# Maintainer: Dominika Liberda <ja@sdomi.pl>
|
||||||
|
pkgname=hostapd-40mhz
|
||||||
|
pkgver=2.9
|
||||||
|
pkgrel=3
|
||||||
|
pkgdesc="daemon for wireless software access points"
|
||||||
|
url="https://w1.fi/hostapd/"
|
||||||
|
arch="all"
|
||||||
|
license="custom"
|
||||||
|
makedepends="openssl-dev libnl3-dev linux-headers"
|
||||||
|
subpackages="$pkgname-doc $pkgname-openrc"
|
||||||
|
source="https://w1.fi/releases/hostapd-$pkgver.tar.gz
|
||||||
|
hostapd.initd
|
||||||
|
hostapd.confd
|
||||||
|
CVE-2019-16275.patch
|
||||||
|
0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
|
||||||
|
0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
|
||||||
|
0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
|
||||||
|
CVE-2021-30004.patch::https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15
|
||||||
|
40mhz.patch
|
||||||
|
"
|
||||||
|
options="!check" #no testsuite
|
||||||
|
builddir="$srcdir"/hostapd-$pkgver/hostapd
|
||||||
|
|
||||||
|
# secfixes:
|
||||||
|
# 2.9-r3:
|
||||||
|
# - CVE-2021-30004
|
||||||
|
# 2.9-r2:
|
||||||
|
# - CVE-2020-12695
|
||||||
|
# 2.9-r1:
|
||||||
|
# - CVE-2019-16275
|
||||||
|
# 2.8-r0:
|
||||||
|
# - CVE-2019-11555
|
||||||
|
# - CVE-2019-9496
|
||||||
|
# 2.6-r2:
|
||||||
|
# - CVE-2017-13077
|
||||||
|
# - CVE-2017-13078
|
||||||
|
# - CVE-2017-13079
|
||||||
|
# - CVE-2017-13080
|
||||||
|
# - CVE-2017-13081
|
||||||
|
# - CVE-2017-13082
|
||||||
|
# - CVE-2017-13086
|
||||||
|
# - CVE-2017-13087
|
||||||
|
# - CVE-2017-13088
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
local conf="$builddir/.config"
|
||||||
|
|
||||||
|
# This is required because our builddir is the hostapd/ directory
|
||||||
|
# inside the extracted archive, while patches mostly apply against
|
||||||
|
# the src/ directory that is in the same directory as the hostapd/
|
||||||
|
# one is
|
||||||
|
cd "$builddir"/..
|
||||||
|
for i in "$srcdir"/*.patch; do
|
||||||
|
msg "Applying $i..."
|
||||||
|
patch -p1 -i $i
|
||||||
|
done
|
||||||
|
|
||||||
|
cd "$builddir"
|
||||||
|
sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
|
||||||
|
hostapd.conf
|
||||||
|
|
||||||
|
# toolchain setup
|
||||||
|
sed \
|
||||||
|
-e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_RADIUS_SERVER=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_DRIVER_NONE=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_IEEE80211N=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_IEEE80211R=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_IEEE80211AC=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_FULL_DYNAMIC_VLAN=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_LIBNL32=y/s/^#//' \
|
||||||
|
-e '/^#CONFIG_ACS=y/s/^#//' \
|
||||||
|
defconfig >> .config
|
||||||
|
echo "CC ?= ${CC:-gcc}" >> .config
|
||||||
|
echo "CFLAGS += -I/usr/include/libnl3" >> .config
|
||||||
|
echo "LIBS += -L/usr/lib" >> .config
|
||||||
|
}
|
||||||
|
|
||||||
|
build() {
|
||||||
|
cd "$builddir"
|
||||||
|
make
|
||||||
|
msg "nt_password_hash"
|
||||||
|
make nt_password_hash
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "$builddir"
|
||||||
|
install -d "$pkgdir"/etc/hostapd
|
||||||
|
install hostapd.conf hostapd.accept hostapd.deny hostapd.eap_user \
|
||||||
|
hostapd.radius_clients hostapd.sim_db hostapd.wpa_psk \
|
||||||
|
"$pkgdir"/etc/hostapd/
|
||||||
|
|
||||||
|
install -Dm755 hostapd "$pkgdir"/usr/sbin/hostapd \
|
||||||
|
&& install -Dm755 hostapd_cli "$pkgdir"/usr/bin/hostapd_cli \
|
||||||
|
&& install -Dm755 nt_password_hash \
|
||||||
|
"$pkgdir"/usr/bin/nt_password_hash \
|
||||||
|
&& install -Dm755 "$srcdir"/hostapd.initd \
|
||||||
|
"$pkgdir"/etc/init.d/hostapd \
|
||||||
|
&& install -Dm644 "$srcdir"/hostapd.confd \
|
||||||
|
"$pkgdir"/etc/conf.d/hostapd \
|
||||||
|
&& install -Dm644 hostapd.8 \
|
||||||
|
"$pkgdir"/usr/share/man/man8/hostapd.8 \
|
||||||
|
&& install -Dm644 hostapd_cli.1 \
|
||||||
|
"$pkgdir"/usr/share/man/man1/hostapd_cli
|
||||||
|
}
|
||||||
|
sha512sums="66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c hostapd-2.9.tar.gz
|
||||||
|
b54b7c6aa17e5cb86a9b354a516eb2dbefb544df18471339c61d82776de447011a2ac290bea1e6c8beae4b6cebefafb8174683ea42fb773e9e8fe6c679f33ba3 hostapd.initd
|
||||||
|
0882263bbd7c0b05bf51f51d66e11a23a0b8ca7da2a3b8a30166d2c5f044c0c134e6bccb1d02c9e81819ca8fb0c0fb55c7121a08fe7233ccaa73ff8ab9a238fe hostapd.confd
|
||||||
|
63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38 CVE-2019-16275.patch
|
||||||
|
b76bbca282a74ef16c0303e5dbd2ccd33a62461595964d52c1481b0bfa4f41deacde56830b85409b288803b87ceb6f33cf0ccc69c5b17ec632c2d4784b872f3c 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
|
||||||
|
00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
|
||||||
|
69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
|
||||||
|
88608529763a6fd9e8cb1e9c9a35630dc2e311a260e023e2a69002d0db700d5f58fc7723a00433b4ea895b92c371cf1db221f38742490b4ed9b4b049892b65e1 CVE-2021-30004.patch
|
||||||
|
a0f834707fb726674d050fd1dfdc954af8cd98fb655aaf0b14d6b38734bc0bc883691119daf9826624d656c66011b2d6f94c7624007aaf2b7d008890ae1533d4 40mhz.patch"
|
73
sakamoto/hostapd-40mhz/CVE-2019-16275.patch
Normal file
73
sakamoto/hostapd-40mhz/CVE-2019-16275.patch
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
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
|
||||||
|
|
5
sakamoto/hostapd-40mhz/hostapd.confd
Normal file
5
sakamoto/hostapd-40mhz/hostapd.confd
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
# Space separated list of configuration files
|
||||||
|
CONFIGS="/etc/hostapd/hostapd.conf"
|
||||||
|
|
||||||
|
# Extra options to pass to hostapd, see hostapd(8)
|
||||||
|
OPTIONS=""
|
46
sakamoto/hostapd-40mhz/hostapd.initd
Normal file
46
sakamoto/hostapd-40mhz/hostapd.initd
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
#!/sbin/openrc-run
|
||||||
|
# Copyright 1999-2006 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.9-init.d,v 1.2 2009/05/17 10:18:18 gurligebis Exp $
|
||||||
|
|
||||||
|
extra_started_commands="reload"
|
||||||
|
|
||||||
|
depend() {
|
||||||
|
need net
|
||||||
|
after firewall
|
||||||
|
use logger
|
||||||
|
}
|
||||||
|
|
||||||
|
checkconfig() {
|
||||||
|
local file
|
||||||
|
|
||||||
|
for file in ${CONFIGS}; do
|
||||||
|
if [ ! -r "${file}" ]; then
|
||||||
|
eerror "hostapd configuration file (${CONFIG}) not found"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
start() {
|
||||||
|
checkconfig || return 1
|
||||||
|
|
||||||
|
ebegin "Starting ${SVCNAME}"
|
||||||
|
start-stop-daemon --start --exec /usr/sbin/hostapd \
|
||||||
|
-- -B ${OPTIONS} ${CONFIGS}
|
||||||
|
eend $?
|
||||||
|
}
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
ebegin "Stopping ${SVCNAME}"
|
||||||
|
start-stop-daemon --stop --exec /usr/sbin/hostapd
|
||||||
|
eend $?
|
||||||
|
}
|
||||||
|
|
||||||
|
reload() {
|
||||||
|
checkconfig || return 1
|
||||||
|
|
||||||
|
ebegin "Reloading ${SVCNAME} configuration"
|
||||||
|
kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
|
||||||
|
eend $?
|
||||||
|
}
|
Loading…
Reference in a new issue