Skip to content

Commit 241d46d

Browse files
committed
Merge branch 'tipc-revert-two-patches'
Tuong Lien says: ==================== tipc: revert two patches We revert two patches: tipc: Fix potential tipc_node refcnt leak in tipc_rcv tipc: Fix potential tipc_aead refcnt leak in tipc_crypto_rcv which prevented TIPC encryption from working properly and caused kernel panic. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 11e877b + a275727 commit 241d46d

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

net/tipc/crypto.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,6 @@ int tipc_crypto_rcv(struct net *net, struct tipc_crypto *rx,
17121712
case -EBUSY:
17131713
this_cpu_inc(stats->stat[STAT_ASYNC]);
17141714
*skb = NULL;
1715-
tipc_aead_put(aead);
17161715
return rc;
17171716
default:
17181717
this_cpu_inc(stats->stat[STAT_NOK]);

net/tipc/node.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,6 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b)
20382038
n = tipc_node_find_by_id(net, ehdr->id);
20392039
}
20402040
tipc_crypto_rcv(net, (n) ? n->crypto_rx : NULL, &skb, b);
2041-
tipc_node_put(n);
20422041
if (!skb)
20432042
return;
20442043

0 commit comments

Comments
 (0)