leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

igmp: do not remove igmp souce list info when set link down

Browse Source 
In commit 24cf3af3fe ("igmp: call ip_mc_clear_src..."), we forgot to remove
igmpv3_clear_delrec() in ip_mc_down(), which also called ip_mc_clear_src().
This make us clear all IGMPv3 source filter info after NETDEV_DOWN.
Move igmpv3_clear_delrec() to ip_mc_destroy_dev() and then no need
ip_mc_clear_src() in ip_mc_destroy_dev().

On the other hand, we should restore back instead of free all source filter
info in igmpv3_del_delrec(). Or we will not able to restore IGMPv3 source
filter info after NETDEV_UP and NETDEV_POST_TYPE_CHANGE.

Fixes: 24cf3af3fe ("igmp: call ip_mc_clear_src() only when ...")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hangbin Liu 2016-11-14 16:16:28 +08:00 committed by David S. Miller
parent f6c365fad1
commit 24803f38a5
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
net/ipv4/igmp.c
View File

@ -162,7 +162,7 @@ static int unsolicited_report_interval(struct in_device *in_dev)
} }
static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im); static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im);
static void igmpv3_del_delrec(struct in_device *in_dev, __be32 multiaddr); static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im);
static void igmpv3_clear_delrec(struct in_device *in_dev); static void igmpv3_clear_delrec(struct in_device *in_dev);
static int sf_setstate(struct ip_mc_list *pmc); static int sf_setstate(struct ip_mc_list *pmc);
static void sf_markstate(struct ip_mc_list *pmc); static void sf_markstate(struct ip_mc_list *pmc);
@ -1130,10 +1130,15 @@ static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im)
spin_unlock_bh(&in_dev->mc_tomb_lock); spin_unlock_bh(&in_dev->mc_tomb_lock);
} }
static void igmpv3_del_delrec(struct in_device *in_dev, __be32 multiaddr) /*
* restore ip_mc_list deleted records
*/
static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im)
{ {
struct ip_mc_list *pmc, *pmc_prev; struct ip_mc_list *pmc, *pmc_prev;
struct ip_sf_list *psf, *psf_next; struct ip_sf_list *psf;
struct net *net = dev_net(in_dev->dev);
__be32 multiaddr = im->multiaddr;
spin_lock_bh(&in_dev->mc_tomb_lock); spin_lock_bh(&in_dev->mc_tomb_lock);
pmc_prev = NULL; pmc_prev = NULL;
@ -1149,16 +1154,26 @@ static void igmpv3_del_delrec(struct in_device *in_dev, __be32 multiaddr)
in_dev->mc_tomb = pmc->next; in_dev->mc_tomb = pmc->next;
} }
spin_unlock_bh(&in_dev->mc_tomb_lock); spin_unlock_bh(&in_dev->mc_tomb_lock);
spin_lock_bh(&im->lock);
if (pmc) { if (pmc) {
for (psf = pmc->tomb; psf; psf = psf_next) { im->interface = pmc->interface;
psf_next = psf->sf_next; im->crcount = in_dev->mr_qrv ?: net->ipv4.sysctl_igmp_qrv;
kfree(psf); im->sfmode = pmc->sfmode;
if (pmc->sfmode == MCAST_INCLUDE) {
im->tomb = pmc->tomb;
im->sources = pmc->sources;
for (psf = im->sources; psf; psf = psf->sf_next)
psf->sf_crcount = im->crcount;
} }
in_dev_put(pmc->interface); in_dev_put(pmc->interface);
kfree(pmc);
} }
spin_unlock_bh(&im->lock);
} }
/*
* flush ip_mc_list deleted records
*/
static void igmpv3_clear_delrec(struct in_device *in_dev) static void igmpv3_clear_delrec(struct in_device *in_dev)
{ {
struct ip_mc_list *pmc, *nextpmc; struct ip_mc_list *pmc, *nextpmc;
@ -1366,7 +1381,7 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
ip_mc_hash_add(in_dev, im); ip_mc_hash_add(in_dev, im);
#ifdef CONFIG_IP_MULTICAST #ifdef CONFIG_IP_MULTICAST
igmpv3_del_delrec(in_dev, im->multiaddr); igmpv3_del_delrec(in_dev, im);
#endif #endif
igmp_group_added(im); igmp_group_added(im);
if (!in_dev->dead) if (!in_dev->dead)
@ -1626,8 +1641,12 @@ void ip_mc_remap(struct in_device *in_dev)
ASSERT_RTNL(); ASSERT_RTNL();
for_each_pmc_rtnl(in_dev, pmc) for_each_pmc_rtnl(in_dev, pmc) {
#ifdef CONFIG_IP_MULTICAST
igmpv3_del_delrec(in_dev, pmc);
#endif
igmp_group_added(pmc); igmp_group_added(pmc);
}
} }
/* Device going down */ /* Device going down */
@ -1648,7 +1667,6 @@ void ip_mc_down(struct in_device *in_dev)
in_dev->mr_gq_running = 0; in_dev->mr_gq_running = 0;
if (del_timer(&in_dev->mr_gq_timer)) if (del_timer(&in_dev->mr_gq_timer))
__in_dev_put(in_dev); __in_dev_put(in_dev);
igmpv3_clear_delrec(in_dev);
#endif #endif
ip_mc_dec_group(in_dev, IGMP_ALL_HOSTS); ip_mc_dec_group(in_dev, IGMP_ALL_HOSTS);
@ -1688,8 +1706,12 @@ void ip_mc_up(struct in_device *in_dev)
#endif #endif
ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS); ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS);
for_each_pmc_rtnl(in_dev, pmc) for_each_pmc_rtnl(in_dev, pmc) {
#ifdef CONFIG_IP_MULTICAST
igmpv3_del_delrec(in_dev, pmc);
#endif
igmp_group_added(pmc); igmp_group_added(pmc);
}
} }
/* /*
@ -1704,13 +1726,13 @@ void ip_mc_destroy_dev(struct in_device *in_dev)
/* Deactivate timers */ /* Deactivate timers */
ip_mc_down(in_dev); ip_mc_down(in_dev);
#ifdef CONFIG_IP_MULTICAST
igmpv3_clear_delrec(in_dev);
#endif
while ((i = rtnl_dereference(in_dev->mc_list)) != NULL) { while ((i = rtnl_dereference(in_dev->mc_list)) != NULL) {
in_dev->mc_list = i->next_rcu; in_dev->mc_list = i->next_rcu;
in_dev->mc_count--; in_dev->mc_count--;
/* We've dropped the groups in ip_mc_down already */
ip_mc_clear_src(i);
ip_ma_put(i); ip_ma_put(i);
} }
} }