2021-08-16 13:26:33

by Dinghao Liu

Subject: [PATCH] net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32

qlcnic_83xx_unlock_flash() is called on all paths after we call
qlcnic_83xx_lock_flash(), except for one error path on failure
of QLCRD32(), which may cause a deadlock. This bug is suggested
by a static analysis tool, please advise.

Fixes: 81d0aeb0a4fff ("qlcnic: flash template based firmware reset recovery")
Signed-off-by: Dinghao Liu <[email protected]>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index d8882d0b6b49..d51bac7ba5af 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -3156,8 +3156,10 @@ int qlcnic_83xx_flash_read32(struct qlcnic_adapter *adapter, u32 flash_addr,

indirect_addr = QLC_83XX_FLASH_DIRECT_DATA(addr);
ret = QLCRD32(adapter, indirect_addr, &err);
- if (err == -EIO)
+ if (err == -EIO) {
+ qlcnic_83xx_unlock_flash(adapter);
return err;
+ }

word = ret;
*(u32 *)p_data = word;
--
2.17.1

2021-08-17 15:32:33

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Mon, 16 Aug 2021 21:14:04 +0800 you wrote:
> qlcnic_83xx_unlock_flash() is called on all paths after we call
> qlcnic_83xx_lock_flash(), except for one error path on failure
> of QLCRD32(), which may cause a deadlock. This bug is suggested
> by a static analysis tool, please advise.
>
> Fixes: 81d0aeb0a4fff ("qlcnic: flash template based firmware reset recovery")
> Signed-off-by: Dinghao Liu <[email protected]>
>
> [...]

Here is the summary with links:
- net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32
https://git.kernel.org/netdev/net/c/0a298d133893

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html