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

Cy Schubert cy at FreeBSD.org
Tue Jun 9 05:43:51 UTC 2020


Author: cy
Date: Tue Jun  9 05:43:51 2020
New Revision: 361960
URL: https://svnweb.freebsd.org/changeset/base/361960

Log:
  Post CVE-2020-12695 cleanup patch:
  
  Resolve a Linuxism to fix the build.
  
  MFC after:	3 days
  X-MFC with:	r361957, r361958, r361959

Modified:
  head/contrib/wpa/src/wps/wps_upnp.c

Modified: head/contrib/wpa/src/wps/wps_upnp.c
==============================================================================
--- head/contrib/wpa/src/wps/wps_upnp.c	Tue Jun  9 05:39:37 2020	(r361959)
+++ head/contrib/wpa/src/wps/wps_upnp.c	Tue Jun  9 05:43:51 2020	(r361960)
@@ -950,7 +950,11 @@ int get_netif_info(const char *net_if, unsigned *ip_ad
 				   errno, strerror(errno));
 			goto fail;
 		}
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+		addr = (struct sockaddr_in *) &req.ifr_addr;
+#else
 		addr = (struct sockaddr_in *) &req.ifr_netmask;
+#endif
 		netmask->s_addr = addr->sin_addr.s_addr;
 	}
 


More information about the svn-src-head mailing list