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

Thu Apr 9 17:14:51 UTC 2015

Author: slh-guest
Date: Thu Apr  9 17:14:51 2015
New Revision: 1931

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1931
Log:
* NOT RELEASED YET
* hostapd: avoid segfault with driver=wired, by merging upstream commit
  e9b783d58c23a7bb50b2f25bce7157f1f3b5d58b "Fix hostapd operation without
  hw_mode driver data."
* wpasupplicant: install systemd unit (Closes: #766746).
* wpasupplicant: configure driver fallback for networkd.

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

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1931&op=diff
==============================================================================

--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Thu Apr  9 17:14:51 2015
@@ -1,10 +1,16 @@
-wpa (2.3-2) unstable; urgency=medium
-
+wpa (2.3-2) UNRELEASED; urgency=medium
+
+  * NOT RELEASED YET
   * remove Kel Modderman from Uploaders as per his request, many thanks for
     all past efforts Kel.
   * fix systemd unit dependencies for wpasupplicant, it needs to be started
     before the network target (Closes: 780552), many thanks to Michael Biebl
     <biebl at debian.org> for reporting and suggesting the patch.
+  * hostapd: avoid segfault with driver=wired, by merging upstream commit
+    e9b783d58c23a7bb50b2f25bce7157f1f3b5d58b "Fix hostapd operation without
+    hw_mode driver data."
+  * wpasupplicant: install systemd unit (Closes: #766746).
+  * wpasupplicant: configure driver fallback for networkd.
 
  -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Tue, 17 Mar 2015 02:23:24 +0100
 

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=1931&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	Thu Apr  9 17:14:51 2015
@@ -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)

Added: wpa/trunk/debian/patches/networkd-driver-fallback.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/networkd-driver-fallback.patch?rev=1931&op=file
==============================================================================
--- wpa/trunk/debian/patches/networkd-driver-fallback.patch	(added)
+++ wpa/trunk/debian/patches/networkd-driver-fallback.patch	Thu Apr  9 17:14:51 2015
@@ -0,0 +1,15 @@
+wpasupplicant: configure driver fallback for networkd
+
+Signed-off-by: Stefan Lippers-Hollmann <s.l-h at gmx.de>
+
+--- a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
++++ b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
+@@ -7,7 +7,7 @@ After=sys-subsystem-net-devices-%i.devic
+ 
+ [Service]
+ Type=simple
+-ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
++ExecStart=@BINDIR@/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -Dnl80211,wext -i%I
+ 
+ [Install]
+ Alias=multi-user.target.wants/wpa_supplicant@%i.service

Modified: wpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/series?rev=1931&op=diff
==============================================================================
--- wpa/trunk/debian/patches/series	(original)
+++ wpa/trunk/debian/patches/series	Thu Apr  9 17:14:51 2015
@@ -6,4 +6,6 @@
 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
+networkd-driver-fallback.patch
 wpasupplicant_fix-systemd-unit-dependencies.patch

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1931&op=diff
==============================================================================
--- wpa/trunk/debian/rules	(original)
+++ wpa/trunk/debian/rules	Thu Apr  9 17:14:51 2015
@@ -92,6 +92,8 @@
 	# install systemd support
 	install --mode=644 -D wpa_supplicant/systemd/wpa_supplicant.service \
 		debian/wpasupplicant/lib/systemd/system/wpa_supplicant.service
+	install --mode=644 -D wpa_supplicant/systemd/wpa_supplicant at .service \
+		debian/wpasupplicant/lib/systemd/system/wpa_supplicant at .service
 	# install D-Bus service activation files & configuration
 	install --mode=644 -D wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
 		debian/wpasupplicant/etc/dbus-1/system.d/wpa_supplicant.conf


