mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-15 01:01:56 -04:00
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>
This commit is contained in:
parent
5e01d87b10
commit
bdd37028a0
1 changed files with 4 additions and 1 deletions
|
|
@ -1210,7 +1210,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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue