diff options
-rw-r--r-- | net/ipv4/igmp.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 85a6e5d70632..8f62d66d0857 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -1850,14 +1850,6 @@ static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml, | |||
1850 | return err; | 1850 | return err; |
1851 | } | 1851 | } |
1852 | 1852 | ||
1853 | |||
1854 | static void ip_mc_socklist_reclaim(struct rcu_head *rp) | ||
1855 | { | ||
1856 | kfree(container_of(rp, struct ip_mc_socklist, rcu)); | ||
1857 | /* sk_omem_alloc should have been decreased by the caller*/ | ||
1858 | } | ||
1859 | |||
1860 | |||
1861 | /* | 1853 | /* |
1862 | * Ask a socket to leave a group. | 1854 | * Ask a socket to leave a group. |
1863 | */ | 1855 | */ |
@@ -1897,7 +1889,7 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr) | |||
1897 | rtnl_unlock(); | 1889 | rtnl_unlock(); |
1898 | /* decrease mem now to avoid the memleak warning */ | 1890 | /* decrease mem now to avoid the memleak warning */ |
1899 | atomic_sub(sizeof(*iml), &sk->sk_omem_alloc); | 1891 | atomic_sub(sizeof(*iml), &sk->sk_omem_alloc); |
1900 | call_rcu(&iml->rcu, ip_mc_socklist_reclaim); | 1892 | kfree_rcu(iml, rcu); |
1901 | return 0; | 1893 | return 0; |
1902 | } | 1894 | } |
1903 | if (!in_dev) | 1895 | if (!in_dev) |
@@ -2312,7 +2304,7 @@ void ip_mc_drop_socket(struct sock *sk) | |||
2312 | ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr); | 2304 | ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr); |
2313 | /* decrease mem now to avoid the memleak warning */ | 2305 | /* decrease mem now to avoid the memleak warning */ |
2314 | atomic_sub(sizeof(*iml), &sk->sk_omem_alloc); | 2306 | atomic_sub(sizeof(*iml), &sk->sk_omem_alloc); |
2315 | call_rcu(&iml->rcu, ip_mc_socklist_reclaim); | 2307 | kfree_rcu(iml, rcu); |
2316 | } | 2308 | } |
2317 | rtnl_unlock(); | 2309 | rtnl_unlock(); |
2318 | } | 2310 | } |