Unverified Commit e8011b70 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4077 [sync] PR-4069: tipc: fix a potential deadlock on &tx->lock 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/4069 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YJFNR7LB5SZZT52W6LU3LL73CW4XP37H/ 
 
https://gitee.com/src-openeuler/kernel/issues/I8WZL1 
 
Link:https://gitee.com/openeuler/kernel/pulls/4077

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7332e91b a79baf7a

net/tipc/crypto.c

+2 −2
Original line number Diff line number Diff line
@@ -1445,14 +1445,14 @@ static int tipc_crypto_key_revoke(struct net *net, u8 tx_key) 
	struct tipc_crypto *tx = tipc_net(net)->crypto_tx;

	struct tipc_key key;



	spin_lock(&tx->lock);

	spin_lock_bh(&tx->lock);

	key = tx->key;

	WARN_ON(!key.active || tx_key != key.active);



	/* Free the active key */

	tipc_crypto_key_set_state(tx, key.passive, 0, key.pending);

	tipc_crypto_key_detach(tx->aead[key.active], &tx->lock);

	spin_unlock(&tx->lock);

	spin_unlock_bh(&tx->lock);



	pr_warn("%s: key is revoked\n", tx->name);

	return -EKEYREVOKED;