From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Perches Subject: Re: [PATCH] Fix infinite loop on dev_mc_unsync() Date: Fri, 09 Nov 2007 11:07:16 -0800 Message-ID: <1194635236.19522.3.camel@localhost> References: <20071109151135.GA12982@pogo> <20071109183733.GA22714@pogo> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jeff Garzik , David Miller To: "Luis R. Rodriguez" Return-path: In-Reply-To: <20071109183733.GA22714@pogo> Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org On Fri, 2007-11-09 at 13:51 -0500, Luis R. Rodriguez wrote: > While reviewing net/core/dev_mcast.c I found what I think is an > infinite loop on dev_mc_unsync(). This fixes it. We make use of > this guy on mac80211 in ieee80211_stop(). This is untested. > > Signed-off-by: Luis R. Rodriguez > > diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c > index 15241cf..5373c03 100644 > --- a/net/core/dev_mcast.c > +++ b/net/core/dev_mcast.c > @@ -168,8 +168,10 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from) > da = from->mc_list; > while (da != NULL) { > next = da->next; > - if (!da->da_synced) > + if (!da->da_synced) { > + da = next; > continue; > + } > __dev_addr_delete(&to->mc_list, &to->mc_count, > da->da_addr, da->da_addrlen, 0); > da->da_synced = 0; > - > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Perhaps this is clearer as: void dev_mc_unsync(struct net_device *to, struct net_device *from) { struct dev_addr_list *da; netif_tx_lock_bh(from); netif_tx_lock_bh(to); da = from->mc_list; while (da) { if (da->da_synced) { __dev_addr_delete(&to->mc_list, &to->mc_count, da->da_addr, da->da_addrlen, 0); __dev_addr_delete(&from->mc_list, &from->mc_count, da->da_addr, da->da_addrlen, 0); da->da_synced = 0; } da = da->next; } __dev_set_rx_mode(to); netif_tx_unlock_bh(to); netif_tx_unlock_bh(from); } EXPORT_SYMBOL(dev_mc_unsync);