[PATCH] tg3: Check return value of tg3_nvram_lock before resetting lock
From: Wentao Liang
Date: Tue Feb 11 2025 - 10:27:54 EST
The current code does not check the return value of tg3_nvram_lock before
resetting the lock count (tp->nvram_lock_cnt = 0). This is dangerous
because if tg3_nvram_lock fails, the lock state may be inconsistent,
leading to potential race conditions or undefined behavior.
This patch adds a check for the return value of tg3_nvram_lock. If the
function fails, the error is propagated to the caller, ensuring that
the lock state remains consistent.
Signed-off-by: Wentao Liang <vulab@xxxxxxxxxxx>
---
drivers/net/ethernet/broadcom/tg3.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 9cc8db10a8d6..851d19b3f43c 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -9160,7 +9160,9 @@ static int tg3_chip_reset(struct tg3 *tp)
if (!pci_device_is_present(tp->pdev))
return -ENODEV;
- tg3_nvram_lock(tp);
+ err = tg3_nvram_lock(tp);
+ if (err)
+ return err;
tg3_ape_lock(tp, TG3_APE_LOCK_GRC);
--
2.42.0.windows.2