Commit 75016891 authored by Hoang Le's avatar Hoang Le Committed by David S. Miller

Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv"

This reverts commit 6bf24dc0.
Above fix is not correct and caused memory leak issue.

Fixes: 6bf24dc0 ("net:tipc: Fix a double free in tipc_sk_mcast_rcv")
Acked-by: default avatarJon Maloy <jmaloy@redhat.com>
Acked-by: default avatarTung Nguyen <tung.q.nguyen@dektech.com.au>
Signed-off-by: default avatarHoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 414ed7fe
...@@ -1262,7 +1262,10 @@ void tipc_sk_mcast_rcv(struct net *net, struct sk_buff_head *arrvq, ...@@ -1262,7 +1262,10 @@ void tipc_sk_mcast_rcv(struct net *net, struct sk_buff_head *arrvq,
spin_lock_bh(&inputq->lock); spin_lock_bh(&inputq->lock);
if (skb_peek(arrvq) == skb) { if (skb_peek(arrvq) == skb) {
skb_queue_splice_tail_init(&tmpq, inputq); 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); spin_unlock_bh(&inputq->lock);
__skb_queue_purge(&tmpq); __skb_queue_purge(&tmpq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment