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/DETAILS                                                   
      |    1 
 net/wpa_supplicant/HISTORY                                                   
      |    4 
 net/wpa_supplicant/PRE_BUILD                                                 
      |    6 +
 4 files changed, 53 insertions(+)

New commits:
commit 2136a6ed3e7ddfc22e904433a44371d8e6caf2c3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    wpa_supplicant: add patch for that buffer overflow

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
new file mode 100644
index 0000000..de1964c
--- /dev/null
+++ 
b/net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
@@ -0,0 +1,42 @@
+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/DETAILS b/net/wpa_supplicant/DETAILS
index 555e082..164f285 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -9,6 +9,7 @@ elif [[ $WPA_RELEASE == devel ]]; then
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 else
          VERSION=2.4
+  SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
      
SOURCE_HASH=sha512:03d8199325b3910f77013ddb7edd803ab4444542230484e1cb465dc3df9372b39ee3307d823ce88730e8f5a5231ef3183954c54cf07297b70432f526e45aac2b
 fi
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 80f95b3..ff323e9 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2015-05-12 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD, 0001-P2P...copying-it-C.patch: add patch for buffer 
overflow issue
+       * DETAILS: SECURITY_PATCH++
+
 2015-03-22 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: version 2.4, updated URLs
 
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 7349fc1..aa6f574 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -12,6 +12,12 @@ if is_depends_enabled $SPELL dbus; then
   fi
 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"
 fi