From: Tim Harvey Date: Thu, 9 Dec 2010 18:43:13 +0000 (-0800) Subject: mac80211: Fix NULL-pointer deference on ibss merge when not ready X-Git-Tag: v2.6.37-rc8~13^2~31^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c926d006c1514cfb3572893f41f2324e96823661;p=pandora-kernel.git 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 Reviewed-by: Johannes Berg Signed-off-by: John W. Linville --- Reading git-diff-tree failed