[pkg-wpa-devel] r1921 - in /wpa/trunk/debian: changelog patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch patches/series

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Mon Nov 17 00:04:28 2014
New Revision: 1921

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1921
Log:
hostapd: avoid segfault with driver=wired, by merging upstream commit
e9b783d58c23a7bb50b2f25bce7157f1f3b5d58b "Fix hostapd operation without
hw_mode driver data."

Added:
    wpa/trunk/debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch
Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/patches/series

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1921&op=diff
==============================================================================
--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Mon Nov 17 00:04:28 2014
@@ -1,6 +1,9 @@
 wpa (2.3-2) UNRELEASED; urgency=medium
 
   * NOT RELEASED YET
+  * hostapd: avoid segfault with driver=wired, by merging upstream commit
+    e9b783d58c23a7bb50b2f25bce7157f1f3b5d58b "Fix hostapd operation without
+    hw_mode driver data."
 
  -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Thu, 16 Oct 2014 02:32:17 +0200
 

Added: wpa/trunk/debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch?rev=1921&op=file
==============================================================================
--- wpa/trunk/debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch	(added)
+++ wpa/trunk/debian/patches/hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch	Mon Nov 17 00:04:28 2014
@@ -0,0 +1,27 @@
+From e9b783d58c23a7bb50b2f25bce7157f1f3b5d58b Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j at w1.fi>
+Date: Sun, 16 Nov 2014 23:08:04 +0000
+Subject: Fix hostapd operation without hw_mode driver data
+
+Commit 7f0303d5b0bb425f3e7318a7016b55ba9e67f9de ('hostapd: Verify VHT
+160/80+80 MHz driver support') added couple of hapd->iface->current_mode
+dereferences of which the one in hostapd_set_freq() can be hit with some
+configuration files when using driver wrappers that do not have hw_mode
+data, i.e., when current_mode is NULL. This could result in segmentation
+fault when trying to use driver=wired. Fix this by checking that
+current_mode is not NULL before dereferencing it to get vht_capab.
+
+Signed-off-by: Jouni Malinen <j at w1.fi>
+---
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -573,7 +573,8 @@ int hostapd_set_freq(struct hostapd_data
+ 				    vht_enabled, sec_channel_offset,
+ 				    vht_oper_chwidth,
+ 				    center_segment0, center_segment1,
+-				    hapd->iface->current_mode->vht_capab))
++				    hapd->iface->current_mode ?
++				    hapd->iface->current_mode->vht_capab : 0))
+ 		return -1;
+ 
+ 	if (hapd->driver == NULL)

Modified: wpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/series?rev=1921&op=diff
==============================================================================
--- wpa/trunk/debian/patches/series	(original)
+++ wpa/trunk/debian/patches/series	Mon Nov 17 00:04:28 2014
@@ -6,3 +6,4 @@
 wpa_gui_desktop_add-keywords-entry.patch
 wpa_supplicant-MACsec-fix-build-failure-for-IEEE8021.patch
 include-ieee802_11_common.c-in-wpa_supplicant-build-.patch
+hostapd_fix-hostapd-operation-without-hw_mode-driver-data.patch