diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-02 15:13:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-02 15:13:47 -0700 |
| commit | 241d46dce9f4ee64e742e12568034b9ba4762961 (patch) | |
| tree | 2d4027727ce5c7a55b00fd8fc10e9d7c37cce044 /net/tipc/crypto.c | |
| parent | 11e877b2a8cfd282a1b81f9d4c594b900889a5d8 (diff) | |
| parent | a275727b1899d14d33d6c8c70f303b73f01cdbc6 (diff) | |
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>
Diffstat (limited to 'net/tipc/crypto.c')
| -rw-r--r-- | net/tipc/crypto.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c index 8c47ded2edb6..c8c47fc72653 100644 --- a/net/tipc/crypto.c +++ b/net/tipc/crypto.c @@ -1712,7 +1712,6 @@ exit: 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]); |