summaryrefslogtreecommitdiff
path: root/contrib/wpa
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2020-06-09 05:43:51 +0000
committerCy Schubert <cy@FreeBSD.org>2020-06-09 05:43:51 +0000
commitee7b7f3f057c6d2027ba25337377967b594a66a0 (patch)
tree643edbe5b6f33dc594728dd944e382b977f03ee3 /contrib/wpa
parent7d748adc91eaf3a31357e66e567118e515917b5a (diff)
downloadsrc-test-ee7b7f3f057c6d2027ba25337377967b594a66a0.tar.gz
src-test-ee7b7f3f057c6d2027ba25337377967b594a66a0.zip
Post CVE-2020-12695 cleanup patch:
Resolve a Linuxism to fix the build. MFC after: 3 days X-MFC with: r361957, r361958, r361959
Notes
Notes: svn path=/head/; revision=361960
Diffstat (limited to 'contrib/wpa')
-rw-r--r--contrib/wpa/src/wps/wps_upnp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/wpa/src/wps/wps_upnp.c b/contrib/wpa/src/wps/wps_upnp.c
index 93d6fb59a6a97..642ebfc38ca92 100644
--- a/contrib/wpa/src/wps/wps_upnp.c
+++ b/contrib/wpa/src/wps/wps_upnp.c
@@ -950,7 +950,11 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
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;
}