summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSalam Noureddine <noureddine@aristanetworks.com>2013-09-29 13:39:42 -0700
committerDavid S. Miller <davem@davemloft.net>2013-09-30 22:28:56 -0700
commite2401654dd0f5f3fb7a8d80dad9554d73d7ca394 (patch)
treef069b5c04468689ec87ef6cdf0e97054ae3dcb41
parent437a3ae1d0b42197928d52e1108bc2fdc14d23fd (diff)
downloadlinux-e2401654dd0f5f3fb7a8d80dad9554d73d7ca394.tar.gz
linux-e2401654dd0f5f3fb7a8d80dad9554d73d7ca394.tar.bz2
linux-e2401654dd0f5f3fb7a8d80dad9554d73d7ca394.zip
ipv4 igmp: use in_dev_put in timer handlers instead of __in_dev_put
It is possible for the timer handlers to run after the call to ip_mc_down so use in_dev_put instead of __in_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 in_device 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>
-rw-r--r--net/ipv4/igmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index dace87f06e5f..7defdc9ba167 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -736,7 +736,7 @@ static void igmp_gq_timer_expire(unsigned long data)
in_dev->mr_gq_running = 0;
igmpv3_send_report(in_dev, NULL);
- __in_dev_put(in_dev);
+ in_dev_put(in_dev);
}
static void igmp_ifc_timer_expire(unsigned long data)
@@ -749,7 +749,7 @@ static void igmp_ifc_timer_expire(unsigned long data)
igmp_ifc_start_timer(in_dev,
unsolicited_report_interval(in_dev));
}
- __in_dev_put(in_dev);
+ in_dev_put(in_dev);
}
static void igmp_ifc_event(struct in_device *in_dev)