diff options
| author | Hoang Le <hoang.h.le@dektech.com.au> | 2021-05-14 08:23:03 +0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-03 08:36:19 +0200 |
| commit | eff80392fe9ca7c8bfbedb0d61f1de63ebd8b0a5 (patch) | |
| tree | e2c747b9c49d2f95e6a22a875e4d5aff5e223d30 /net | |
| parent | 136863d09ec93885a31859656241e82cdafc1190 (diff) | |
| download | linux-stable-eff80392fe9ca7c8bfbedb0d61f1de63ebd8b0a5.tar.gz linux-stable-eff80392fe9ca7c8bfbedb0d61f1de63ebd8b0a5.tar.bz2 linux-stable-eff80392fe9ca7c8bfbedb0d61f1de63ebd8b0a5.zip | |
Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv"
commit 75016891357a628d2b8acc09e2b9b2576c18d318 upstream.
This reverts commit 6bf24dc0cc0cc43b29ba344b66d78590e687e046.
Above fix is not correct and caused memory leak issue.
Fixes: 6bf24dc0cc0c ("net:tipc: Fix a double free in tipc_sk_mcast_rcv")
Acked-by: Jon Maloy <jmaloy@redhat.com>
Acked-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tipc/socket.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 6fd5e1a7a336..14e6cb814e4c 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -840,7 +840,10 @@ void tipc_sk_mcast_rcv(struct net *net, struct sk_buff_head *arrvq, spin_lock_bh(&inputq->lock); if (skb_peek(arrvq) == skb) { skb_queue_splice_tail_init(&tmpq, inputq); - __skb_dequeue(arrvq); + /* Decrease the skb's refcnt as increasing in the + * function tipc_skb_peek + */ + kfree_skb(__skb_dequeue(arrvq)); } spin_unlock_bh(&inputq->lock); __skb_queue_purge(&tmpq); |