Commit 9260d3e1 authored by Salam Noureddine's avatar Salam Noureddine Committed by David S. Miller

ipv6 mcast: use in6_dev_put in timer handlers instead of __in6_dev_put

It is possible for the timer handlers to run after the call to
ipv6_mc_down so use in6_dev_put instead of __in6_dev_put in the
handler function in order to do proper cleanup when the refcnt
reaches 0. Otherwise, the refcnt can reach zero without the
inet6_dev being destroyed and we end up leaking a reference to
the net_device and see messages like the following,

unregister_netdevice: waiting for eth0 to become free. Usage count = 1

Tested on linux-3.4.43.
Signed-off-by: default avatarSalam Noureddine <noureddine@aristanetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2401654
...@@ -2034,7 +2034,7 @@ static void mld_dad_timer_expire(unsigned long data) ...@@ -2034,7 +2034,7 @@ static void mld_dad_timer_expire(unsigned long data)
if (idev->mc_dad_count) if (idev->mc_dad_count)
mld_dad_start_timer(idev, idev->mc_maxdelay); mld_dad_start_timer(idev, idev->mc_maxdelay);
} }
__in6_dev_put(idev); in6_dev_put(idev);
} }
static int ip6_mc_del1_src(struct ifmcaddr6 *pmc, int sfmode, static int ip6_mc_del1_src(struct ifmcaddr6 *pmc, int sfmode,
...@@ -2379,7 +2379,7 @@ static void mld_gq_timer_expire(unsigned long data) ...@@ -2379,7 +2379,7 @@ static void mld_gq_timer_expire(unsigned long data)
idev->mc_gq_running = 0; idev->mc_gq_running = 0;
mld_send_report(idev, NULL); mld_send_report(idev, NULL);
__in6_dev_put(idev); in6_dev_put(idev);
} }
static void mld_ifc_timer_expire(unsigned long data) static void mld_ifc_timer_expire(unsigned long data)
...@@ -2392,7 +2392,7 @@ static void mld_ifc_timer_expire(unsigned long data) ...@@ -2392,7 +2392,7 @@ static void mld_ifc_timer_expire(unsigned long data)
if (idev->mc_ifc_count) if (idev->mc_ifc_count)
mld_ifc_start_timer(idev, idev->mc_maxdelay); mld_ifc_start_timer(idev, idev->mc_maxdelay);
} }
__in6_dev_put(idev); in6_dev_put(idev);
} }
static void mld_ifc_event(struct inet6_dev *idev) static void mld_ifc_event(struct inet6_dev *idev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment