|
@@ -1850,14 +1850,6 @@ static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-static void ip_mc_socklist_reclaim(struct rcu_head *rp)
|
|
|
|
-{
|
|
|
|
- kfree(container_of(rp, struct ip_mc_socklist, rcu));
|
|
|
|
- /* sk_omem_alloc should have been decreased by the caller*/
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Ask a socket to leave a group.
|
|
* Ask a socket to leave a group.
|
|
*/
|
|
*/
|
|
@@ -1897,7 +1889,7 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
|
|
rtnl_unlock();
|
|
rtnl_unlock();
|
|
/* decrease mem now to avoid the memleak warning */
|
|
/* decrease mem now to avoid the memleak warning */
|
|
atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
|
|
atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
|
|
- call_rcu(&iml->rcu, ip_mc_socklist_reclaim);
|
|
|
|
|
|
+ kfree_rcu(iml, rcu);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
if (!in_dev)
|
|
if (!in_dev)
|
|
@@ -2312,7 +2304,7 @@ void ip_mc_drop_socket(struct sock *sk)
|
|
ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr);
|
|
ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr);
|
|
/* decrease mem now to avoid the memleak warning */
|
|
/* decrease mem now to avoid the memleak warning */
|
|
atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
|
|
atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
|
|
- call_rcu(&iml->rcu, ip_mc_socklist_reclaim);
|
|
|
|
|
|
+ kfree_rcu(iml, rcu);
|
|
}
|
|
}
|
|
rtnl_unlock();
|
|
rtnl_unlock();
|
|
}
|
|
}
|