linux.git/net/wireless, branch v4.2-rc3

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-06-14T06:56:52+00:00

cfg80211: wext: clear sinfo struct before calling driver

2015-06-09T20:54:58+00:00

Until recently, mac80211 overwrote all the statistics it could
provide when getting called, but it now relies on the struct
having been zeroed by the caller. This was always the case in
nl80211, but wext used a static struct which could even cause
values from one device leak to another.

Using a static struct is OK (as even documented in a comment)
since the whole usage of this function and its return value is
always locked under RTNL. Not clearing the struct for calling
the driver has always been wrong though, since drivers were
free to only fill values they could report, so calling this
for one device and then for another would always have leaked
values from one to the other.

Fix this by initializing the structure in question before the
driver method call.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=99691

Cc: stable@vger.kernel.org
Reported-by: Gerrit Renker 
Reported-by: Alexander Kaltsas 
Signed-off-by: Johannes Berg 
Signed-off-by: David S. Miller

cfg80211: ignore netif running state when changing iftype

2015-05-29T11:05:40+00:00

It was possible for mac80211 to be coerced into an
unexpected flow causing sdata union to become
corrupted. Station pointer was put into
sdata->u.vlan.sta memory location while it was
really master AP's sdata->u.ap.next_beacon. This
led to station entry being later freed as
next_beacon before __sta_info_flush() in
ieee80211_stop_ap() and a subsequent invalid
pointer dereference crash.

The problem was that ieee80211_ptr->use_4addr
wasn't cleared on interface type changes.

This could be reproduced with the following steps:

 # host A and host B have just booted; no
 # wpa_s/hostapd running; all vifs are down
 host A> iw wlan0 set type station
 host A> iw wlan0 set 4addr on
 host A> printf 'interface=wlan0\nssid=4addrcrash\nchannel=1\nwds_sta=1' > /tmp/hconf
 host A> hostapd -B /tmp/conf
 host B> iw wlan0 set 4addr on
 host B> ifconfig wlan0 up
 host B> iw wlan0 connect -w hostAssid
 host A> pkill hostapd
 # host A crashed:

 [  127.928192] BUG: unable to handle kernel NULL pointer dereference at 00000000000006c8
 [  127.929014] IP: [] __sta_info_flush+0xac/0x158
 ...
 [  127.934578]  [] ieee80211_stop_ap+0x139/0x26c
 [  127.934578]  [] ? dump_trace+0x279/0x28a
 [  127.934578]  [] __cfg80211_stop_ap+0x84/0x191
 [  127.934578]  [] cfg80211_stop_ap+0x3f/0x58
 [  127.934578]  [] nl80211_stop_ap+0x1b/0x1d
 [  127.934578]  [] genl_family_rcv_msg+0x259/0x2b5

Note: This isn't a revert of f8cdddb8d61d
("cfg80211: check iface combinations only when
iface is running") as far as functionality is
considered because b6a550156bc ("cfg80211/mac80211:
move more combination checks to mac80211") moved
the logic somewhere else already.

Fixes: f8cdddb8d61d ("cfg80211: check iface combinations only when iface is running")
Signed-off-by: Michal Kazior 
Signed-off-by: Johannes Berg

cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect

2015-05-26T13:21:27+00:00

When we disconnect from the AP, drivers call cfg80211_disconnect().
This doesn't know whether the disconnection was initiated locally
or by the AP though, which can cause problems with the supplicant,
for example with WPS. This issue obviously doesn't show up with any
mac80211 based driver since mac80211 doesn't call this function.

Fix this by requiring drivers to indicate whether the disconnect is
locally generated or not. I've tried to update the drivers, but may
not have gotten the values correct, and some drivers may currently
not be able to report correct values. In case of doubt I left it at
false, which is the current behaviour.

For libertas, make adjustments as indicated by Dan Williams.

Reported-by: Matthieu Mauger 
Tested-by: Matthieu Mauger 
Signed-off-by: Johannes Berg

cfg80211: Switch to PM ops

2015-05-20T13:00:12+00:00

Use dev_pm_ops instead of the legacy suspend/resume callbacks for the wiphy
class suspend and resume operations.

Signed-off-by: Lars-Peter Clausen 
Signed-off-by: Johannes Berg

cfg80211: change GO_CONCURRENT to IR_CONCURRENT for STA

2015-05-06T13:50:02+00:00

The GO_CONCURRENT regulatory definition can be extended to station
interfaces requesting to IR as part of TDLS off-channel operations.
Rename the GO_CONCURRENT flag to IR_CONCURRENT and allow the added
use-case.

Change internal users of GO_CONCURRENT to use the new definition.

Signed-off-by: Arik Nemtsov 
Reviewed-by: Johannes Berg 
Signed-off-by: Johannes Berg

cfg80211: Allow GO concurrent relaxation after BSS disconnection

2015-05-06T12:47:28+00:00

If a P2P GO was allowed on a channel because of the GO concurrent
relaxation, i.e., another station interface was associated to an AP on
the same channel or the same UNII band, and the station interface
disconnected from the AP, allow the following use cases unless the
channel is marked as indoor only and the device is not operating in an
indoor environment:

1. Allow the P2P GO to stay on its current channel. The rationale behind
   this is that if the channel or UNII band were allowed by the AP they
   could still be used to continue the P2P GO operation, and avoid connection
   breakage.
2. Allow another P2P GO to start on the same channel or another channel
   that is in the same UNII band as the previous instantiated P2P GO.

Signed-off-by: Avraham Stern 
Signed-off-by: Arik Nemtsov 
Signed-off-by: Ilan Peer 
Signed-off-by: Emmanuel Grumbach 
Signed-off-by: Johannes Berg

cfg80211: allow the plink state blocking for user managed mesh

2015-04-24T10:22:36+00:00

wpa_supplicant or authsae handles the mesh peering in user
space, but the plink state is still managed in kernel space.
Currently, there is no implementation by wpa_supplicant or
authsae to block the plink state after it is set to ESTAB.

By applying this patch, we can use the "iw mesh0 station set
 plink_action block" to block the peer mesh STA.
This is useful for experimenting purposes.

Signed-off-by: Chun-Yeow Yeoh 
Signed-off-by: Johannes Berg

cfg80211: don't allow disabling WEXT if it's required

2015-04-08T07:19:29+00:00

The change to only export WEXT symbols when required could break
the build if CONFIG_CFG80211_WEXT was explicitly disabled while
a driver like orinoco selected it.

Fix this by hiding the symbol when it's required so it can't be
disabled in that case.

Fixes: 2afe38d15cee ("cfg80211-wext: export symbols only when needed")
Reported-by: Randy Dunlap 
Reported-by: Jim Davis 
Signed-off-by: Johannes Berg

cfg80211: send extended capabilities IE in connect

2015-04-07T11:56:45+00:00

If the connect request from userspace didn't include an extended
capabilities IE, create one using the driver capabilities. This
fixes VHT associations, since those need to set the operating mode
notification capability.

Reviewed-by: Gregory Greenman 
Signed-off-by: Johannes Berg