From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60756C28CC5 for ; Sat, 8 Jun 2019 11:55:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34FB4214AE for ; Sat, 8 Jun 2019 11:55:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994932; bh=JiwfaLUvaigiDjDpiLv7jum12sUQVhzcqO8BoTfA/M4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=F3rKqXe9EcOnF2c+xGBPxrKkyxV0HGjeth3f5UtUN18+ZkdK6cZyy4s68HhiBs5kW 2TjggJ4ZObHtnQFPpODjiKck+HKGx9PdSOqgm6TQ84vVTGn4w+p16MMlO0X99ivUhr 2EB2hFNg6XCThSsYnI3YrsqqPBNIH8wJDvJY4sA4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729108AbfFHLzb (ORCPT ); Sat, 8 Jun 2019 07:55:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:57088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727217AbfFHLkA (ORCPT ); Sat, 8 Jun 2019 07:40:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 31583214D8; Sat, 8 Jun 2019 11:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559993999; bh=JiwfaLUvaigiDjDpiLv7jum12sUQVhzcqO8BoTfA/M4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zyisYZ/5M0OUNPS9FGqekYFnSIopHzqCtRJB5Beomu/u0Dw7TND38jPWOULpbOPEG DhW5YMR+qR3/bxytiZmxtChMr/9SOP1x4xHnBkvo7exBgBcX0M2klBWZ+XZXxPJYNk enrM0WIppmFBmnEVwWA8DedJy2A6VLhTNBvqF2ss= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Greg Kroah-Hartman , Sasha Levin , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 5.1 07/70] staging: wilc1000: Fix some double unlock bugs in wilc_wlan_cleanup() Date: Sat, 8 Jun 2019 07:38:46 -0400 Message-Id: <20190608113950.8033-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190608113950.8033-1-sashal@kernel.org> References: <20190608113950.8033-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit fea69916360468e364a4988db25a5afa835f3406 ] If ->hif_read_reg() or ->hif_write_reg() fail then the code unlocks and keeps executing. It should just return. Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver") Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/wilc1000/wilc_wlan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index c2389695fe20..70b1ab21f8a3 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1076,13 +1076,17 @@ void wilc_wlan_cleanup(struct net_device *dev) acquire_bus(wilc, WILC_BUS_ACQUIRE_AND_WAKEUP); ret = wilc->hif_func->hif_read_reg(wilc, WILC_GP_REG_0, ®); - if (!ret) + if (!ret) { release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); + return; + } ret = wilc->hif_func->hif_write_reg(wilc, WILC_GP_REG_0, (reg | ABORT_INT)); - if (!ret) + if (!ret) { release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); + return; + } release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP); wilc->hif_func->hif_deinit(NULL); -- 2.20.1