Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b70c678 authored by Dinghao Liu's avatar Dinghao Liu Committed by Sasha Levin
Browse files

net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32 



[ Upstream commit 0a298d133893c72c96e2156ed7cb0f0c4a306a3e ]

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: 81d0aeb0 ("qlcnic: flash template based firmware reset recovery")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Link: https://lore.kernel.org/r/20210816131405.24024-1-dinghao.liu@zju.edu.cn


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent da92ce36

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c

+3 −1
Original line number Diff line number Diff line
@@ -3158,8 +3158,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;