Commit 18943d29 authored Nov 08, 2010 by Eric Dumazet Committed by David S. Miller Nov 09, 2010

inet: fix ip_mc_drop_socket()



commit 8723e1b4 (inet: RCU changes in inetdev_by_index())
forgot one call site in ip_mc_drop_socket()

We should not decrease idev refcount after inetdev_by_index() call,
since refcount is not increased anymore.

Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Reported-by: Miles Lane <miles.lane@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent aa58163a

net/ipv4/igmp.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2306,10 +2306,8 @@ void ip_mc_drop_socket(struct sock *sk)

		in_dev = inetdev_by_index(net, iml->multi.imr_ifindex);
		(void) ip_mc_leave_src(sk, iml, in_dev);
		if (in_dev != NULL) {
		if (in_dev != NULL)
		ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr);
		in_dev_put(in_dev);
		}
		/* decrease mem now to avoid the memleak warning */
		atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
		call_rcu(&iml->rcu, ip_mc_socklist_reclaim);

Admin message