Date: Mon, 8 Jun 2020 20:40:09 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r361938 - vendor/wpa/dist/src/wps Message-ID: <202006082040.058Ke9Yi051457@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Mon Jun 8 20:40:09 2020 New Revision: 361938 URL: https://svnweb.freebsd.org/changeset/base/361938 Log: Upstream commit message: [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. Obtained from: https://w1.fi/security/2020-1/\ 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch Security: VU#339275 and CVE-2020-12695 Modified: vendor/wpa/dist/src/wps/wps_upnp_event.c Modified: vendor/wpa/dist/src/wps/wps_upnp_event.c ============================================================================== --- vendor/wpa/dist/src/wps/wps_upnp_event.c Mon Jun 8 20:37:52 2020 (r361937) +++ vendor/wpa/dist/src/wps/wps_upnp_event.c Mon Jun 8 20:40:09 2020 (r361938) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006082040.058Ke9Yi051457>