Commit 79093b9d authored Jun 21, 2018 by Hangbin Liu Committed by Greg Kroah-Hartman Aug 28, 2018

ipv6: mcast: fix unsolicited report interval after receiving querys



[ Upstream commit 6c6da92808442908287fae8ebb0ca041a52469f4 ]

After recieving MLD querys, we update idev->mc_maxdelay with max_delay
from query header. This make the later unsolicited reports have the same
interval with mc_maxdelay, which means we may send unsolicited reports with
long interval time instead of default configured interval time.

Also as we will not call ipv6_mc_reset() after device up. This issue will
be there even after leave the group and join other groups.

Fixes: fc4eba58 ("ipv6: make unsolicited report intervals configurable for mld")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9773c6db

net/ipv6/mcast.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -2062,7 +2062,8 @@ void ipv6_mc_dad_complete(struct inet6_dev *idev)
		mld_send_initial_cr(idev);
		idev->mc_dad_count--;
		if (idev->mc_dad_count)
		mld_dad_start_timer(idev, idev->mc_maxdelay);
		mld_dad_start_timer(idev,
		unsolicited_report_interval(idev));
		}
		}

		@@ -2074,7 +2075,8 @@ static void mld_dad_timer_expire(unsigned long data)
		if (idev->mc_dad_count) {
		idev->mc_dad_count--;
		if (idev->mc_dad_count)
		mld_dad_start_timer(idev, idev->mc_maxdelay);
		mld_dad_start_timer(idev,
		unsolicited_report_interval(idev));
		}
		in6_dev_put(idev);
		}
		@@ -2432,7 +2434,8 @@ static void mld_ifc_timer_expire(unsigned long data)
		if (idev->mc_ifc_count) {
		idev->mc_ifc_count--;
		if (idev->mc_ifc_count)
		mld_ifc_start_timer(idev, idev->mc_maxdelay);
		mld_ifc_start_timer(idev,
		unsolicited_report_interval(idev));
		}
		in6_dev_put(idev);
		}