[PATCH 08/10] af_unix: Unsubscribe sockets from their multicast groups on RCV_SHUTDOWN
From: Javier Martinez Canillas <hidden>
Date: 2012-02-20 16:34:25
Also in:
lkml
Subsystem:
networking [general], networking [unix sockets], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Linus Torvalds
From: Alban Crequy <redacted> Signed-off-by: Alban Crequy <redacted> Reviewed-by: Ian Molton <redacted> --- net/unix/af_unix.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index bd9dc58..07e6b05 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c@@ -2841,6 +2841,10 @@ static int unix_shutdown(struct socket *sock, int mode) { struct sock *sk = sock->sk; struct sock *other; +#ifdef CONFIG_UNIX_MULTICAST + struct unix_sock *u = unix_sk(sk); + int unsubscribed = 0; +#endif mode = (mode+1)&(RCV_SHUTDOWN|SEND_SHUTDOWN);
@@ -2852,7 +2856,38 @@ static int unix_shutdown(struct socket *sock, int mode) other = unix_peer(sk); if (other) sock_hold(other); + +#ifdef CONFIG_UNIX_MULTICAST + /* If the socket subscribed to a multicast group and it is shutdown + * with (mode&RCV_SHUTDOWN), it should be unsubscribed or at least + * stop blocking the peers */ + if (mode&RCV_SHUTDOWN) { + struct unix_mcast *node; + struct hlist_node *pos; + struct hlist_node *pos_tmp; + + spin_lock(&unix_multicast_lock); + hlist_for_each_entry_safe(node, pos, pos_tmp, + &u->mcast_subscriptions, + subscription_node) { + hlist_del_rcu(&node->member_node); + hlist_del_rcu(&node->subscription_node); + atomic_dec(&node->group->mcast_members_cnt); + atomic_inc(&node->group->mcast_membership_generation); + hlist_add_head_rcu(&node->member_dead_node, + &node->group->mcast_dead_members); + unsubscribed = 1; + } + spin_unlock(&unix_multicast_lock); + } +#endif unix_state_unlock(sk); + +#ifdef CONFIG_UNIX_MULTICAST + if (unsubscribed) + wake_up_interruptible_all(&u->peer_wait); +#endif + sk->sk_state_change(sk); if (other &&
--
1.7.7.6