svn commit: r384705 - in head/security/wpa_supplicant: . files

[John Marino]

Author: marino
Date: Sat Apr 25 06:19:16 2015
New Revision: 384705
URL: https://svnweb.freebsd.org/changeset/ports/384705

Log:
  security/wpa_supplicant: Fix CVE-2015-1863
  
  PR:		199678
  Submitted by:	Jason Unovitch
  Approved by:	maintainer (marino)

Added:
  head/security/wpa_supplicant/files/patch-src_p2p_p2p.c   (contents, props changed)
Modified:
  head/security/wpa_supplicant/Makefile

Modified: head/security/wpa_supplicant/Makefile
==============================================================================
--- head/security/wpa_supplicant/Makefile	Sat Apr 25 05:51:18 2015	(r384704)
+++ head/security/wpa_supplicant/Makefile	Sat Apr 25 06:19:16 2015	(r384705)
@@ -2,6 +2,7 @@
 
 PORTNAME=	wpa_supplicant
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://w1.fi/releases/
 

Added: head/security/wpa_supplicant/files/patch-src_p2p_p2p.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/wpa_supplicant/files/patch-src_p2p_p2p.c	Sat Apr 25 06:19:16 2015	(r384705)
@@ -0,0 +1,10 @@
+--- src/p2p/p2p.c.orig	2015-04-24 22:44:26 UTC
++++ src/p2p/p2p.c
+@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p,
+ 	if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
+ 		os_memcpy(dev->interface_addr, addr, ETH_ALEN);
+ 	if (msg.ssid &&
++	    msg.ssid[1] <= sizeof(dev->oper_ssid) &&
+ 	    (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
+ 	     os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
+ 	     != 0)) {