Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1295697

[PATCH] staging: wilc1000: fix double mutex_unlock on failure path in wilc_wlan_cleanup()

Show all headers | View raw

If hif_read_reg() or hif_write_reg() fail in wilc_wlan_cleanup(),
it calls release_bus() and continues execution. But it leads to double
release_bus() call that means double unlock of g_linux_wlan->hif_cs mutex.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
---
 drivers/staging/wilc1000/wilc_wlan.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index a73e99f..4b7c8e9 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1459,15 +1459,16 @@ void wilc_wlan_cleanup(struct net_device *dev)
 	ret = p->hif_func.hif_read_reg(wilc, WILC_GP_REG_0, &reg);
 	if (!ret) {
 		PRINT_ER("Error while reading reg\n");
-		release_bus(wilc, RELEASE_ALLOW_SLEEP);
+		goto _unlock;
 	}
 	PRINT_ER("Writing ABORT reg\n");
 	ret = p->hif_func.hif_write_reg(wilc, WILC_GP_REG_0,
 					(reg | ABORT_INT));
 	if (!ret) {
 		PRINT_ER("Error while writing reg\n");
-		release_bus(wilc, RELEASE_ALLOW_SLEEP);
+		goto _unlock;
 	}
+_unlock:
 	release_bus(wilc, RELEASE_ALLOW_SLEEP);
 	p->hif_func.hif_deinit(NULL);
 }
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH] staging: wilc1000: fix double mutex_unlock on failure  path in wilc_wlan_cleanup() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-12-19 01:50 +0100
  [PATCH] staging: wilc1000: fix double mutex_unlock on failure path in wilc_wlan_cleanup() Alexey Khoroshilov <khoroshilov@ispras.ru> - 2015-12-20 22:50 +0100
    Re: [PATCH] staging: wilc1000: fix double mutex_unlock on failure  path in wilc_wlan_cleanup() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-12-21 22:30 +0100
      [PATCH v3] staging: wilc1000: fix double mutex_unlock on failure path in wilc_wlan_cleanup() Alexey Khoroshilov <khoroshilov@ispras.ru> - 2015-12-22 18:50 +0100
    Re: [PATCH] staging: wilc1000: fix double mutex_unlock on failure  path in wilc_wlan_cleanup() Dan Carpenter <dan.carpenter@oracle.com> - 2015-12-22 09:10 +0100

csiph-web