aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/crypto.c
diff options
context:
space:
mode:
authorJason Gunthorpe <jgg@nvidia.com>2020-08-31 12:28:12 -0300
committerJason Gunthorpe <jgg@nvidia.com>2020-08-31 12:28:12 -0300
commit6989aa62d342d79d447a9af12477b907d211bebe (patch)
tree09722ffca5dea6933dec72691f89a8cb09f78656 /net/tipc/crypto.c
parentRDMA/rxe: Address an issue with hardened user copy (diff)
parentLinux 5.9-rc3 (diff)
downloadlinux-dev-6989aa62d342d79d447a9af12477b907d211bebe.tar.xz
linux-dev-6989aa62d342d79d447a9af12477b907d211bebe.zip
Merge tag 'v5.9-rc3' into rdma.git for-next
Required due to dependencies in following patches. Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'net/tipc/crypto.c')
-rw-r--r--net/tipc/crypto.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c
index 001bcb0f2480..c38babaa4e57 100644
--- a/net/tipc/crypto.c
+++ b/net/tipc/crypto.c
@@ -757,10 +757,12 @@ static void tipc_aead_encrypt_done(struct crypto_async_request *base, int err)
switch (err) {
case 0:
this_cpu_inc(tx->stats->stat[STAT_ASYNC_OK]);
+ rcu_read_lock();
if (likely(test_bit(0, &b->up)))
b->media->send_msg(net, skb, b, &tx_ctx->dst);
else
kfree_skb(skb);
+ rcu_read_unlock();
break;
case -EINPROGRESS:
return;