Commit 241d46dc authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 11e877b2 a275727b

net/tipc/crypto.c

+0 −1
Original line number Diff line number Diff line
@@ -1712,7 +1712,6 @@ int tipc_crypto_rcv(struct net *net, struct tipc_crypto *rx, 
	case -EBUSY:

		this_cpu_inc(stats->stat[STAT_ASYNC]);

		*skb = NULL;

		tipc_aead_put(aead);

		return rc;

	default:

		this_cpu_inc(stats->stat[STAT_NOK]);

net/tipc/node.c

+0 −1
Original line number Diff line number Diff line
@@ -2038,7 +2038,6 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b) 
		n = tipc_node_find_by_id(net, ehdr->id);

	}

	tipc_crypto_rcv(net, (n) ? n->crypto_rx : NULL, &skb, b);

	tipc_node_put(n);

	if (!skb)

		return;