Commit 08d3ffcc authored Jul 20, 2018 by Hangbin Liu Committed by David S. Miller Jul 21, 2018

multicast: do not restore deleted record source filter mode to new one

There are two scenarios that we will restore deleted records. The first is
when device down and up(or unmap/remap). In this scenario the new filter
mode is same with previous one. Because we get it from in_dev->mc_list and
we do not touch it during device down and up.

The other scenario is when a new socket join a group which was just delete
and not finish sending status reports. In this scenario, we should use the
current filter mode instead of restore old one. Here are 4 cases in total.

old_socket new_socket before_fix after_fix
IN(A) IN(A) ALLOW(A) ALLOW(A)
IN(A) EX( ) TO_IN( ) TO_EX( )
EX( ) IN(A) TO_EX( ) ALLOW(A)
EX( ) EX( ) TO_EX( ) TO_EX( )

Fixes: 24803f38 (igmp: do not remove igmp souce list info when set link down)
Fixes: 1666d49e (mld: do not remove mld souce list info when set link down)
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3d82475a

net/ipv4/igmp.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1200,8 +1200,7 @@ static void igmpv3_del_delrec(struct in_device in_dev, struct ip_mc_list im)
		spin_lock_bh(&im->lock);
		if (pmc) {
		im->interface = pmc->interface;
		im->sfmode = pmc->sfmode;
		if (pmc->sfmode == MCAST_INCLUDE) {
		if (im->sfmode == MCAST_INCLUDE) {
		im->tomb = pmc->tomb;
		im->sources = pmc->sources;
		for (psf = im->sources; psf; psf = psf->sf_next)

net/ipv6/mcast.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -790,8 +790,7 @@ static void mld_del_delrec(struct inet6_dev idev, struct ifmcaddr6 im)
		spin_lock_bh(&im->mca_lock);
		if (pmc) {
		im->idev = pmc->idev;
		im->mca_sfmode = pmc->mca_sfmode;
		if (pmc->mca_sfmode == MCAST_INCLUDE) {
		if (im->mca_sfmode == MCAST_INCLUDE) {
		im->mca_tomb = pmc->mca_tomb;
		im->mca_sources = pmc->mca_sources;
		for (psf = im->mca_sources; psf; psf = psf->sf_next)

Admin message