1 files changed, 5 insertions, 0 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index b542f14ed444..922b75ff56d3 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -485,6 +485,7 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
                 tsk_set_unreturnable(tsk, true);
                 if (sock->type == SOCK_DGRAM)
                         tsk_set_unreliable(tsk, true);
+                __skb_queue_head_init(&tsk->mc_method.deferredq);
         }
 
         trace_tipc_sk_create(sk, NULL, TIPC_DUMP_NONE, " ");
@@ -582,6 +583,7 @@ static int tipc_release(struct socket *sock)
         sk->sk_shutdown = SHUTDOWN_MASK;
         tipc_sk_leave(tsk);
         tipc_sk_withdraw(tsk, 0, NULL);
+        __skb_queue_purge(&tsk->mc_method.deferredq);
         sk_stop_timer(sk, &sk->sk_timer);
         tipc_sk_remove(tsk);
 
@@ -2162,6 +2164,9 @@ static void tipc_sk_filter_rcv(struct sock *sk, struct sk_buff *skb,
         if (unlikely(grp))
                 tipc_group_filter_msg(grp, &inputq, xmitq);
 
+        if (msg_type(hdr) == TIPC_MCAST_MSG)
+                tipc_mcast_filter_msg(&tsk->mc_method.deferredq, &inputq);
+
         /* Validate and add to receive buffer if there is space */
         while ((skb = __skb_dequeue(&inputq))) {
                 hdr = buf_msg(skb);