]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
mac80211: Ensure initializing private mc_list in prepare_multicast().
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Sun, 4 Apr 2010 17:59:30 +0000 (17:59 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Apr 2010 07:12:30 +0000 (00:12 -0700)
Fix kernel panic by NULL pointer dereference in the context of
ieee80211_ops->prepare_multicast().

This bug was introduced by commit 22bedad3c.. ("net: convert
multicast list to list_head").

Call __hw_addr_init() in ieee80211_alloc_hw() to initialize
list_head of private device multicast list, like we do in
bond_init().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mac80211/main.c

index 84ad249a4e2e8d58269463c9e432a134227df269..0b82cd2f781ef335b7b285baa492617850e81fd9 100644 (file)
@@ -388,6 +388,9 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
        local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
 
        INIT_LIST_HEAD(&local->interfaces);
+
+       __hw_addr_init(&local->mc_list);
+
        mutex_init(&local->iflist_mtx);
        mutex_init(&local->scan_mtx);