tipc: fix a potential deadlock on &tx->lock
Subsystems (3)
PATCH 1/1 tipc: fix a potential deadlock on &tx->lock
It seems that tipc_crypto_key_revoke() could be be invoked by wokequeue tipc_crypto_work_rx() under process context and timer/rx callback under softirq context, thus the lock acquisition on &tx->lock seems better use spin_lock_bh() to prevent possible deadlock.
This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
tipc_crypto_work_rx() <workqueue>
--> tipc_crypto_key_distr()
--> tipc_bcast_xmit()
--> tipc_bcbase_xmit()
--> tipc_bearer_bc_xmit()
--> tipc_crypto_xmit()
--> tipc_ehdr_build()
--> tipc_crypto_key_revoke()
--> spin_lock(&tx->lock)
<timer interrupt>
--> tipc_disc_timeout()
--> tipc_bearer_xmit_skb()
--> tipc_crypto_xmit()
--> tipc_ehdr_build()
--> tipc_crypto_key_revoke()
--> spin_lock(&tx->lock) <deadlock here>
--- net/tipc/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/tipc/crypto.c +2 -2
@@ -1441,14 +1441,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 ;
Signature · 1 line
2.17.1
Quoted 9 lines · Chengfeng Ye
It seems that
tipc_crypto_key_revoke()could be be invoked by wokequeuetipc_crypto_work_rx()under process context and timer/rx callback under softirq context, thus the lock acquisition on&tx->lockseems better usespin_lock_bh()to prevent possible deadlock.This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
Interesting.
Quoted 17 lines
tipc_crypto_work_rx()<workqueue>
-->tipc_crypto_key_distr()
-->tipc_bcast_xmit()
-->tipc_bcbase_xmit()
-->tipc_bearer_bc_xmit()
-->tipc_crypto_xmit()
-->tipc_ehdr_build()
-->tipc_crypto_key_revoke()
-->spin_lock(&tx->lock)
<timer interrupt>
-->tipc_disc_timeout()
-->tipc_bearer_xmit_skb()
-->tipc_crypto_xmit()
-->tipc_ehdr_build()
-->tipc_crypto_key_revoke()
-->spin_lock(&tx->lock)<deadlock here>
Quoted 2 lines
Signed-off-by Chengfeng Ye <[email protected]>---
Quoted 24 lines
net/tipc/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)net/tipc/crypto.c +2
-2@@ -1441,14 +1441,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 ;
Simon Horman
reviewerQuoted 26 lines · Chengfeng Ye
It seems that
tipc_crypto_key_revoke()could be be invoked by wokequeuetipc_crypto_work_rx()under process context and timer/rx callback under softirq context, thus the lock acquisition on&tx->lockseems better usespin_lock_bh()to prevent possible deadlock.This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
tipc_crypto_work_rx()<workqueue>
-->tipc_crypto_key_distr()
-->tipc_bcast_xmit()
-->tipc_bcbase_xmit()
-->tipc_bearer_bc_xmit()
-->tipc_crypto_xmit()
-->tipc_ehdr_build()
-->tipc_crypto_key_revoke()
-->spin_lock(&tx->lock)
<timer interrupt>
-->tipc_disc_timeout()
-->tipc_bearer_xmit_skb()
-->tipc_crypto_xmit()
-->tipc_ehdr_build()
-->tipc_crypto_key_revoke()
-->spin_lock(&tx->lock)<deadlock here>
Quoted 1 line
Signed-off-by Chengfeng Ye <[email protected]>
Hi Chengfeng Ye,
thanks for your patch.
As a fix for Networking this should probably be targeted at the 'net' tree. Which should be denoted in the subject.
Subject: [PATCH net] ...
And as a fix this patch should probably have a Fixes tag. This ones seem appropriate to me, but I could be wrong.
I don't think it is necessary to repost just to address these issues, but the Networking maintainers may think otherwise.
The code change itself looks good to me.
Quoted 42 lines · Chengfeng Ye
It seems that
tipc_crypto_key_revoke()could be be invoked by wokequeuetipc_crypto_work_rx()under process context and timer/rx callback under softirq context, thus the lock acquisition on&tx->lockseems better usespin_lock_bh()to prevent possible deadlock.This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
tipc_crypto_work_rx()<workqueue>
-->tipc_crypto_key_distr()
-->tipc_bcast_xmit()
-->tipc_bcbase_xmit()
-->tipc_bearer_bc_xmit()
-->tipc_crypto_xmit()
-->tipc_ehdr_build()
-->tipc_crypto_key_revoke()
-->spin_lock(&tx->lock)
<timer interrupt>--> tipc_disc_timeout() --> tipc_bearer_xmit_skb() --> tipc_crypto_xmit() --> tipc_ehdr_build() --> tipc_crypto_key_revoke() --> spin_lock(&tx->lock) <deadlock here>Signed-off-by Chengfeng Ye <[email protected]>--- net/tipc/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)net/tipc/crypto.c +1
-1@@ -1441,14 +1441,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;
net/tipc/crypto.c static int tipc_crypto_key_revoke(struct net *net, u8 tx_key) · line 1454
Quoted 10 lines
net/tipc/crypto.c +1
-1WARN_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 ;
Thanks much for your review.
Regards,
Chengfeng
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Wed, 27 Sep 2023 18:14:14 +0000 you wrote:
It seems that
tipc_crypto_key_revoke()could be be invoked by wokequeuetipc_crypto_work_rx()under process context and timer/rx callback under softirq context, thus the lock acquisition on&tx->lockseems better usespin_lock_bh()to prevent possible deadlock.This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
[...]
Here is the summary with links:
- tipc: fix a potential deadlock on &tx->lock
https://git.kernel.org/netdev/net/c/08e50cf07184
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html