e1000e: fix double release of mutex
Subsystems (2)
PATCH 1/1 e1000e: fix double release of mutex
During a reset, releasing the swflag after it failed to be acquired would cause a double unlock of the mutex. Instead, test whether acquisition of the swflag was successful and if not, do not release the swflag. The reset must still be done to bring the device to a quiescent state.
This resolves [BUG 12200] BUG: bad unlock balance detected! e1000e
http://bugzilla.kernel.org/show_bug.cgi?id=12200
---
drivers/net/e1000e/ich8lan.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/e1000e/ich8lan.c +7 -2
@@ -1893,12 +1893,17 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) ctrl |=E1000_CTRL_PHY_RST ; } ret_val =e1000_acquire_swflag_ich8lan (hw); +/* Whether or not the swflag was acquired, we need to reset the part */ hw_dbg (hw,"Issuing a global reset to ich8lan" );ew32 (CTRL , (ctrl |E1000_CTRL_RST ));msleep (20 ); -/* release the swflag because it is not reset by hardware reset */ -e1000_release_swflag_ich8lan (hw); +if (!ret_val) { +/* release the swflag because it is not reset by +* hardware reset +*/ +e1000_release_swflag_ich8lan (hw); + } ret_val =e1000e_get_auto_rd_done (hw);if (ret_val) {
Quoted 31 lines · Jeff Kirsher
During a reset, releasing the swflag after it failed to be acquired would cause a double unlock of the mutex. Instead, test whether acquisition of the swflag was successful and if not, do not release the swflag. The reset must still be done to bring the device to a quiescent state.
This resolves [BUG 12200] BUG: bad unlock balance detected! e1000e
http://bugzilla.kernel.org/show_bug.cgi?id=12200Signed-off-by Jeff Kirsher <[email protected]>---
drivers/net/e1000e/ich8lan.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)drivers/net/e1000e/ich8lan.c +2
-2@@ -1893,12 +1893,17 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) ctrl |=E1000_CTRL_PHY_RST ; } ret_val =e1000_acquire_swflag_ich8lan (hw); +/* Whether or not the swflag was acquired, we need to reset the part */ hw_dbg (hw,"Issuing a global reset to ich8lan" );ew32 (CTRL , (ctrl |E1000_CTRL_RST ));msleep (20 ); -/* release the swflag because it is not reset by hardware reset */ -e1000_release_swflag_ich8lan (hw); +if (!ret_val) {
drivers/net/e1000e/ich8lan.c static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
Quoted 10 lines
drivers/net/e1000e/ich8lan.c +5
-1+/* release the swflag because it is not reset by +* hardware reset +*/ +e1000_release_swflag_ich8lan (hw); + } ret_val =e1000e_get_auto_rd_done (hw);if (ret_val) { --
I meant to put [RESPIN] in the title, but I did not. So here is the respin.
Signature · 2 lines
Cheers, Jeff
From: Jeff Kirsher <[email protected]>
Date: Thu, 11 Dec 2008 21:20:26 -0800
Quoted 9 lines
During a reset, releasing the swflag after it failed to be acquired would cause a double unlock of the mutex. Instead, test whether acquisition of the swflag was successful and if not, do not release the swflag. The reset must still be done to bring the device to a quiescent state.
This resolves [BUG 12200] BUG: bad unlock balance detected! e1000e
http://bugzilla.kernel.org/show_bug.cgi?id=12200Signed-off-by Jeff Kirsher <[email protected]>
Applied, thanks for respinning this.