Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8067623ybl; Thu, 16 Jan 2020 10:04:47 -0800 (PST) X-Google-Smtp-Source: APXvYqyVjEVZiYU5Ayj5PRurzjhUaq4bq+XEoW12JRFJTcR8LNKO+2xavhw5PdfPriWxfLxl5xlN X-Received: by 2002:aca:edc5:: with SMTP id l188mr223385oih.55.1579197887458; Thu, 16 Jan 2020 10:04:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579197887; cv=none; d=google.com; s=arc-20160816; b=ZuDUmzQwxB082aRajPMgXHYj74+QTifau8t8jvdqA19WGPO7//jkDWEe/VK9w9GI+/ uaqSb/8wQIIc9uufUxwcjiPWEAmhn4OgfgpWBpFr3EK7XdrfnjFi55r4ZGxz5TGPsOy6 hUmNm0BvIp8Chq+3Dh2ruM3iBADAr5svLghC9CGdAHQu/LIFhjPU+0T4q1zpTkm4wyNy xHB5M4sfwxSW7ZTp45InKgyybnntZAp0sBOV+iM16Bin0wAdW80BotRKn/NMuw8ofJcm W1dwciH5N5Vs3uIO8HCqxWsKtMEZIDm2KKaPZSsyXQCrMW0J9BGfHA8YYRmJA8Z+VDFn U3ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tiz2t8HlM+b8wgLPe/iRYXqMrM/aTWMLT1SGqBP+uyI=; b=i1qmMMtMfMUD8/BZan9z/VDYJEb9vmwSFuQj/BuUNuWepzc/jjAwzgH0GimJXQyvo3 oGrgBIxFGL+QYha9lSZ2XrJrluCgP7LRwwZSiJbxOMCKEa1d/IODJnsyY7rIj0KCvMZ1 sq1sNpuZxC5T4HuMdfG/+vazhbWj5cdcow2BoYjxvdvEaiij0+th2wGhyOZ2j9cHJtW2 nUlm7qXCuaXmNE0GsJgOY5IwV8lFNWX0mUPwMPjq8/BLL9X2Fz1wHQppxv+WBaTlsbqw LD8866C2p9QoHlaGXCDNFm4nvacGqXg0HZnteQK/6+yFeLC8JRmqR3H0IM+tI8udFwIm cr8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FFmsvvnw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id 25si11608470oix.178.2020.01.16.10.04.32; Thu, 16 Jan 2020 10:04:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FFmsvvnw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S2394957AbgAPSBj (ORCPT + 99 others); Thu, 16 Jan 2020 13:01:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:59062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405653AbgAPRl0 (ORCPT ); Thu, 16 Jan 2020 12:41:26 -0500 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 AFA3B246CF; Thu, 16 Jan 2020 17:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196485; bh=W5GsXPgetj+H1lgqnH7m0kOe+yhVb2jMSSzjWLFHHfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FFmsvvnwHOJMuhJrQqYLWXtz1ymLaZx4NSNChg39DiL7WFTGR/Rde7SoKAQ7MKPsH ndRt2nbFV5x+nHohP9toVvLgDgbc7PGyJnEOUS4YNpLY/bpmKS1myx1iO49sMW19Jc 6Gku5LWdVgSZzZvfro82X+0gXX63ebTR9nxKjC4U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 231/251] scsi: esas2r: unlock on error in esas2r_nvram_read_direct() Date: Thu, 16 Jan 2020 12:36:20 -0500 Message-Id: <20200116173641.22137-191-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-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 906ca6353ac09696c1bf0892513c8edffff5e0a6 ] This error path is missing an unlock. Fixes: 26780d9e12ed ("[SCSI] esas2r: ATTO Technology ExpressSAS 6G SAS/SATA RAID Adapter Driver") Link: https://lore.kernel.org/r/20191022102324.GA27540@mwanda Signed-off-by: Dan Carpenter Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/esas2r/esas2r_flash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/esas2r/esas2r_flash.c b/drivers/scsi/esas2r/esas2r_flash.c index 7bd376d95ed5..b02ac389e6c6 100644 --- a/drivers/scsi/esas2r/esas2r_flash.c +++ b/drivers/scsi/esas2r/esas2r_flash.c @@ -1197,6 +1197,7 @@ bool esas2r_nvram_read_direct(struct esas2r_adapter *a) if (!esas2r_read_flash_block(a, a->nvram, FLS_OFFSET_NVR, sizeof(struct esas2r_sas_nvram))) { esas2r_hdebug("NVRAM read failed, using defaults"); + up(&a->nvram_semaphore); return false; } -- 2.20.1