From: Veaceslav Falico <vfalico@redhat.com>
To: David Stevens <dlstevens@us.ibm.com>
Cc: David Miller <davem@davemloft.net>,
jmorris@namei.org, kaber@trash.net, kuznet@ms2.inr.ac.ru,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
mmarek@suse.cz, netdev@vger.kernel.org, pekkas@netcore.fi,
yoshfuji@linux-ipv6.org
Subject: [PATCH v2 1/1] igmp: call ip_mc_clear_src() only when we have no users of ip_mc_list
Date: Tue, 17 May 2011 15:38:01 +0200 [thread overview]
Message-ID: <20110517133801.GC30366@darkmag.usersys.redhat.com> (raw)
In-Reply-To: <OF948388D5.90B3F5A7-ON88257892.006C3228-88257892.0071B9D5@us.ibm.com>
In igmp_group_dropped() we call ip_mc_clear_src(), which resets the number
of source filters per mulitcast. However, igmp_group_dropped() is also
called on NETDEV_DOWN, NETDEV_PRE_TYPE_CHANGE and NETDEV_UNREGISTER, which
means that the group might get added back on NETDEV_UP, NETDEV_REGISTER and
NETDEV_POST_TYPE_CHANGE respectively, leaving us with broken source
filters.
To fix that, we must clear the source filters only when there are no users
in the ip_mc_list, i.e. in ip_mc_dec_group().
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 1fd3d9c..732e30b 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1182,7 +1182,6 @@ static void igmp_group_dropped(struct ip_mc_list *im)
}
done:
#endif
- ip_mc_clear_src(im);
}
static void igmp_group_added(struct ip_mc_list *im)
@@ -1319,6 +1318,7 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr)
*ip = i->next_rcu;
in_dev->mc_count--;
igmp_group_dropped(i);
+ ip_mc_clear_src(i);
if (!in_dev->dead)
ip_rt_multicast_event(in_dev);
next prev parent reply other threads:[~2011-05-17 13:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-15 16:59 [PATCH 1/1] igmp: fix ip_mc_clear_src to not reset ip_mc_list->sf{mode,count} Veaceslav Falico
2011-05-16 18:03 ` David Miller
2011-05-16 20:42 ` David Stevens
2011-05-17 13:30 ` Veaceslav Falico
2011-05-17 13:38 ` Veaceslav Falico [this message]
2011-05-17 14:37 ` [PATCH v3 1/1] igmp: call ip_mc_clear_src() only when we have no users of ip_mc_list Veaceslav Falico
2011-05-17 17:42 ` David Stevens
2011-05-20 16:27 ` Veaceslav Falico
2011-05-23 17:41 ` David Stevens
2011-05-24 9:15 ` [PATCH v4 " Veaceslav Falico
2011-05-24 17:28 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110517133801.GC30366@darkmag.usersys.redhat.com \
--to=vfalico@redhat.com \
--cc=davem@davemloft.net \
--cc=dlstevens@us.ibm.com \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=pekkas@netcore.fi \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).