Skip to content

Commit

Permalink
ipv6 mcast: use in6_dev_put in timer handlers instead of __in6_dev_put
Browse files Browse the repository at this point in the history
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: Salam Noureddine <noureddine@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Salam Noureddine authored and David S. Miller committed Oct 1, 2013
1 parent e240165 commit 9260d3e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/ipv6/mcast.c
Original file line number Diff line number Diff line change
Expand Up @@ -2034,7 +2034,7 @@ static void mld_dad_timer_expire(unsigned long data)
if (idev->mc_dad_count)
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,
Expand Down Expand Up @@ -2379,7 +2379,7 @@ static void mld_gq_timer_expire(unsigned long data)

idev->mc_gq_running = 0;
mld_send_report(idev, NULL);
__in6_dev_put(idev);
in6_dev_put(idev);
}

static void mld_ifc_timer_expire(unsigned long data)
Expand All @@ -2392,7 +2392,7 @@ static void mld_ifc_timer_expire(unsigned long data)
if (idev->mc_ifc_count)
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)
Expand Down

0 comments on commit 9260d3e

Please sign in to comment.