svn commit: r361959 - head/contrib/wpa/src/wps

[Cy Schubert]

Author: cy
Date: Tue Jun  9 05:39:37 2020
New Revision: 361959
URL: https://svnweb.freebsd.org/changeset/base/361959

Log:
  MFV r361938:
  
  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
  MFC after:	3 days
  Security:	VU#339275 and CVE-2020-12695

Modified:
  head/contrib/wpa/src/wps/wps_upnp_event.c
Directory Properties:
  head/contrib/wpa/   (props changed)

Modified: head/contrib/wpa/src/wps/wps_upnp_event.c
==============================================================================
--- head/contrib/wpa/src/wps/wps_upnp_event.c	Tue Jun  9 05:38:12 2020	(r361958)
+++ head/contrib/wpa/src/wps/wps_upnp_event.c	Tue Jun  9 05:39:37 2020	(r361959)
@@ -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;
 	}