Message ID | 201004050457.o354v6ec008492@94.43.138.210.xn.2iij.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Mon, Apr 05, 2010 at 05:59:30AM CEST, yoshfuji@linux-ipv6.org wrote: >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> >--- > net/mac80211/main.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > >diff --git a/net/mac80211/main.c b/net/mac80211/main.c >index 84ad249..0b82cd2 100644 >--- a/net/mac80211/main.c >+++ b/net/mac80211/main.c >@@ -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); > Whoups, missed this bit. Thanks a lot. Rewieved-by: Jiri Pirko <jpirko@redhat.com> >-- >1.5.6.5 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jiri Pirko <jpirko@redhat.com> Date: Tue, 6 Apr 2010 09:09:23 +0200 > Whoups, missed this bit. Thanks a lot. > > Rewieved-by: Jiri Pirko <jpirko@redhat.com> > Applied, and patchwork doesn't know what "Rewieved-by" is so I fixed the typo and added it to the changelog :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Tue, Apr 06, 2010 at 09:12:59AM CEST, davem@davemloft.net wrote: >From: Jiri Pirko <jpirko@redhat.com> >Date: Tue, 6 Apr 2010 09:09:23 +0200 > >> Whoups, missed this bit. Thanks a lot. >> >> Rewieved-by: Jiri Pirko <jpirko@redhat.com> >> > >Applied, and patchwork doesn't know what "Rewieved-by" is so >I fixed the typo and added it to the changelog :-) Oh my :) Looks like I'm still sleeping... -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 84ad249..0b82cd2 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -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);
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> --- net/mac80211/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)