queue-4.19/tipc-purge-deferredq-list-for-each-grp-member-in-tip.patch

   1 From b539b3ac7f8ef183a88e29e9e196832f88dbd43e Mon Sep 17 00:00:00 2001
   2 From: Xin Long <lucien.xin@gmail.com>
   3 Date: Sun, 16 Jun 2019 17:24:07 +0800
   4 Subject: tipc: purge deferredq list for each grp member in tipc_group_delete
   5
   6 [ Upstream commit 5cf02612b33f104fe1015b2dfaf1758ad3675588 ]
   7
   8 Syzbot reported a memleak caused by grp members' deferredq list not
   9 purged when the grp is be deleted.
  10
  11 The issue occurs when more(msg_grp_bc_seqno(hdr), m->bc_rcv_nxt) in
  12 tipc_group_filter_msg() and the skb will stay in deferredq.
  13
  14 So fix it by calling __skb_queue_purge for each member's deferredq
  15 in tipc_group_delete() when a tipc sk leaves the grp.
  16
  17 Fixes: b87a5ea31c93 ("tipc: guarantee group unicast doesn't bypass group broadcast")
  18 Reported-by: syzbot+78fbe679c8ca8d264a8d@syzkaller.appspotmail.com
  19 Signed-off-by: Xin Long <lucien.xin@gmail.com>
  20 Acked-by: Ying Xue <ying.xue@windriver.com>
  21 Signed-off-by: David S. Miller <davem@davemloft.net>
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23 ---
  24  net/tipc/group.c | 1 +
  25  1 file changed, 1 insertion(+)
  26
  27 diff --git a/net/tipc/group.c b/net/tipc/group.c
  28 index 06fee142f09f..3ee93b5c19b6 100644
  29 --- a/net/tipc/group.c
  30 +++ b/net/tipc/group.c
  31 @@ -218,6 +218,7 @@ void tipc_group_delete(struct net *net, struct tipc_group *grp)
  32
  33         rbtree_postorder_for_each_entry_safe(m, tmp, tree, tree_node) {
  34                 tipc_group_proto_xmit(grp, m, GRP_LEAVE_MSG, &xmitq);
  35 +               __skb_queue_purge(&m->deferredq);
  36                 list_del(&m->list);
  37                 kfree(m);
  38         }
  39 --
  40 2.20.1
  41