]> git.baikalelectronics.ru Git - kernel.git/commit
mac80211: Fix NULL-pointer deference on ibss merge when not ready
authorTim Harvey <harvey.tim@gmail.com>
Thu, 9 Dec 2010 18:43:13 +0000 (10:43 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 13 Dec 2010 19:53:46 +0000 (14:53 -0500)
commit62f892f1dafdfdfb7d158365526d616881e15f65
treeb76f1ac5f172f7a5ee47da767cdc31bd4e164e32
parentf1658598f13e62304621e451d254d957a2604126
mac80211: Fix NULL-pointer deference on ibss merge when not ready

dev_open will eventually call ieee80211_ibss_join which sets up the
skb used for beacons/probe-responses however it is possible to
receive beacons that attempt to merge before this occurs causing
a null pointer dereference.  Check ssid_len as that is the last
thing set in ieee80211_ibss_join.

This occurs quite easily in the presence of adhoc nodes with hidden SSID's

revised previous patch to check further up based on irc feedback

Signed-off-by: Tim Harvey <harvey.tim@gmail.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ibss.c