Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2907057pxb; Tue, 24 Aug 2021 10:19:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRmQp3KvjiwE3UuW+FC+6V97xneDXgLHQi/1ORj3JtvR0iQemuz1jHuteEdGItWanhfjqt X-Received: by 2002:a05:6e02:6d2:: with SMTP id p18mr27398144ils.44.1629825573671; Tue, 24 Aug 2021 10:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629825573; cv=none; d=google.com; s=arc-20160816; b=xEnKJJC1nvbu0t4VFOK7cX8d+K3gNKm9Jqq8SL6QZlWwLxIT10B33PW5ZmLvZKuWBi L3jHMJQnpiV7sy78EztMj0YsF+6T1rDzQxgB5d0bLrd1KHpUgtE92C6EQp6KzHW7VVP1 yFhwmzF/vy/7WIM5VmrFpXZtRuUi754FUSQ2c/h0kIottjjpO+7YNQUd+b2T9ZX81wY9 g+RleJ/nV3BailbZUUS3W84qIovMr9shRZKVdauW8KduFouivWYUwbtQyfjmKddLbkO6 GH4SXNqmI9xppro6peiyQmbmuYJD4BnWTnp9QVR8XWdcFOpOUVze3pYk08jwvaJNIxxU 8x9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ueKwQtK2+EIM+xP5WUGZ94pQ7rWzWUkvb6RsmPkP1LA=; b=hqGPP2o5EXngb1xVb30HkoGXcghFT+153ZqcOtsPwoqBP7WIraWwjiH7CGJD4ChOPV BqGs/By/Pv5Qtanupx0v0LINdWJJJ7TcITSC4k2QQ8p5CyzO9LMpI971vRKj33Qe7WiL D4F0vvlMJk4DRqIuGRCw0UfZsS6JUPPY3S6Mlki2xY5D6Xy2/Jwby+fKVimwvDAR2+C7 wvKmuA56o4PVT+zFwXNE6Gy39ASCx04wDqZ0raLbPO0CC541k0O4ExTxC0qH/5NcFDe6 fxGr1KWX4Bwx4PcvCank94dIpXwkwLp+Kfxnut7U98w817X1DEFQiRkwtJRx+D5RIsu5 mlNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uwGOEo+3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c1si17105568jap.87.2021.08.24.10.19.21; Tue, 24 Aug 2021 10:19:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uwGOEo+3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233433AbhHXRR5 (ORCPT + 99 others); Tue, 24 Aug 2021 13:17:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:55612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240407AbhHXROn (ORCPT ); Tue, 24 Aug 2021 13:14:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D1B7B61A71; Tue, 24 Aug 2021 17:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824506; bh=jyxyVQaqkmFimCiJAMUZ8nBi8wDT8qwusLulxB7ihmQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uwGOEo+35kUcCyLvHAGO6FnEwlP0e8tbzGEv/pMHqrYVkwf8SOPP5dU9CLYcN6hLy hYOHqkFRLw/kHXHYalQnEJjFRWZgggWQdKmwEvptWvj1T4YTtJomBIQeuT1v999kXX 6a20cY/9pF09/7c5xUBypfGfiXrsRtIAsOIivQh+s3dpNm//hqdcO+Tv9+JQ9OqurS eg506JPGrnbyB0Zrn/3CMX09IYPwQ6/h7AeiZHSCuoSFSuh1kzhoANtv8h4hD/L1Gr M9daJiwHh/Z2I87e/Q2HvyBtPwjqmS4tKZhQv8vGcf6EfVGXx78LVnhlOs1GRCiwia WBr2U0vgR1r6g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dinghao Liu , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 39/61] net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32 Date: Tue, 24 Aug 2021 13:00:44 -0400 Message-Id: <20210824170106.710221-40-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824170106.710221-1-sashal@kernel.org> References: <20210824170106.710221-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.143-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.143-rc1 X-KernelTest-Deadline: 2021-08-26T17:01+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu [ 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: 81d0aeb0a4fff ("qlcnic: flash template based firmware reset recovery") Signed-off-by: Dinghao Liu Link: https://lore.kernel.org/r/20210816131405.24024-1-dinghao.liu@zju.edu.cn Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index 29b9c728a65e..f2014c10f7c9 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c @@ -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; -- 2.30.2