Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 
net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
 |   42 ----------
 net/wpa_supplicant/BUILD                                                     
      |    6 +
 net/wpa_supplicant/DETAILS                                                   
      |    6 -
 net/wpa_supplicant/HISTORY                                                   
      |    5 +
 net/wpa_supplicant/PRE_BUILD                                                 
      |    4 
 5 files changed, 13 insertions(+), 50 deletions(-)

New commits:
commit 6e80ee47036f03a9ee53c8dedcdb18b98f4a3540
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    wpa_supplicant: update to 2.5, fix nl80211 (SECURITY_PATCH++, as always)

diff --git 
a/net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
 
b/net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
deleted file mode 100644
index de1964c..0000000
--- 
a/net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni AT qca.qualcomm.com>
-Date: Tue, 7 Apr 2015 11:32:11 +0300
-Subject: [PATCH] P2P: Validate SSID element length before copying it
- (CVE-2015-1863)
-
-This fixes a possible memcpy overflow for P2P dev->oper_ssid in
-p2p_add_device(). The length provided by the peer device (0..255 bytes)
-was used without proper bounds checking and that could have resulted in
-arbitrary data of up to 223 bytes being written beyond the end of the
-dev->oper_ssid[] array (of which about 150 bytes would be beyond the
-heap allocation) when processing a corrupted management frame for P2P
-peer discovery purposes.
-
-This could result in corrupted state in heap, unexpected program
-behavior due to corrupted P2P peer device information, denial of service
-due to process crash, exposure of memory contents during GO Negotiation,
-and potentially arbitrary code execution.
-
-Thanks to Google security team for reporting this issue and smart
-hardware research group of Alibaba security team for discovering it.
-
-Signed-off-by: Jouni Malinen <jouni AT qca.qualcomm.com>
----
- src/p2p/p2p.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
-index f584fae..a45fe73 100644
---- a/src/p2p/p2p.c
-+++ b/src/p2p/p2p.c
-@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, 
int freq,
-       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)) {
--- 
-1.9.1
-
diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index 76e1c6f..267dbaa 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -6,7 +6,7 @@ cd "$SOURCE_DIRECTORY/wpa_supplicant"
 # anyway).
 local VARS="CONFIG_NO_WPA CONFIG_DNET_PCAP CONFIG_L2_PACKET CONFIG_NO_WPA2  \
             CONFIG_NO_STDOUT_DEBUG CONFIG_CTRL_IFACE CONFIG_DRIVER_HOSTAP   \
-            CONFIG_DRIVER_ATMEL  \
+            CONFIG_DRIVER_ATMEL CONFIG_DRIVER_NL80211 \
             CONFIG_DRIVER_WEXT CONFIG_DRIVER_NDISWRAPPER                    \
             CONFIG_DRIVER_IPW CONFIG_DRIVER_WIRED    \
             CONFIG_EAP_MD5 CONFIG_EAP_MSCHAPV2 CONFIG_EAP_TLS               \
@@ -20,6 +20,10 @@ VARS="$VARS CONFIG_TLS" &&
 for var in $VARS $OPTS; do
   if [[ ${!var} != n ]]; then
     echo "$var=${!var:-y}" >> .config
+    # We ship libnl-3.
+    if [[ "$var" = CONFIG_DRIVER_NL80211 ]]; then
+      echo CONFIG_LIBNL32=y >> .config
+    fi
   fi
 done &&
 
diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index 164f285..aaeece5 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -8,10 +8,10 @@ elif [[ $WPA_RELEASE == devel ]]; then
           SOURCE=$SPELL-$VERSION.tar.gz
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 else
-         VERSION=2.4
-  SECURITY_PATCH=1
+         VERSION=2.5
+  SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.gz
-     
SOURCE_HASH=sha512:03d8199325b3910f77013ddb7edd803ab4444542230484e1cb465dc3df9372b39ee3307d823ce88730e8f5a5231ef3183954c54cf07297b70432f526e45aac2b
+     
SOURCE_HASH=sha512:e3ca36ed10b4dae8f663e98ad230c8c059c952316c21a6b0638ecb1b40a5ef1b9083138ab45207cb764a17e870b4bd0625dd6efdb65856cb4dca13ccc0559e81
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://w1.fi/releases/$SOURCE
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index eb0a4a2..55fa3ce 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+2016-01-04 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: update to 2.5, SECURITY_PATCH++
+       * BUILD: actually enable nl80211 driver
+       * PRE_BUILD, 0001-P2P-...-copying-it-C.patch: remove patch
+
 2015-11-11 Ismael Luceno <ismael AT sourcemage.org>
        * DEPENDS: Internal TLS implementation depends on libtommath
 
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index aa6f574..45a1d02 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -13,10 +13,6 @@ if is_depends_enabled $SPELL dbus; then
 fi &&
 
 cd "$SOURCE_DIRECTORY" &&
-if [[ $WPA_RELEASE == stable ]]; then
-  # Should be included in version 2.5.
-  patch -p1 < 
"$SCRIPT_DIRECTORY/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch"
-fi &&
 
 if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11; then
   . "$INSTALL_ROOT/etc/profile.d/qt.sh"