d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r361937:

Browse Source 
Upstream commit message:

[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.

Obtained from:	https://w1.fi/security/2020-1/\
	0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
MFC after:	3 days
Security:	VU#339275 and CVE-2020-12695
This commit is contained in:
Cy Schubert 2020-06-09 05:38:12 +00:00
commit b266d2f206
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=361958
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/wpa/src/wps/wps_upnp.c
View File

@ -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;

3
contrib/wpa/src/wps/wps_upnp_event.c
View File

@ -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);