Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <davem@davemloft.net>

-2
-1
net/tipc/crypto.c
··· 1712 1712 case -EBUSY: 1713 1713 this_cpu_inc(stats->stat[STAT_ASYNC]); 1714 1714 *skb = NULL; 1715 - tipc_aead_put(aead); 1716 1715 return rc; 1717 1716 default: 1718 1717 this_cpu_inc(stats->stat[STAT_NOK]);
-1
net/tipc/node.c
··· 2038 2038 n = tipc_node_find_by_id(net, ehdr->id); 2039 2039 } 2040 2040 tipc_crypto_rcv(net, (n) ? n->crypto_rx : NULL, &skb, b); 2041 - tipc_node_put(n); 2042 2041 if (!skb) 2043 2042 return; 2044 2043