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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 C7C08C282CD for ; Mon, 28 Jan 2019 16:46:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98DC52084C for ; Mon, 28 Jan 2019 16:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548693963; bh=KftWaf79M1TdAqLT2vstyxJ40HAEndbnI/Z53sTFsdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FsVBoL6K9fQMvmnWTSmBDwABMPukWHDky7te4FcsBXWFgPPc8pwpUK91oqIBUXVvZ ahLYIbkWIzfwmp/0T5CpoG92sQMv6kzNJhq3wj2/cjyxG8j/ngAoPBovyBc8Bi6X4f jG0LAkA39J4nDDXZc9Zp6z8JrvDPTGEbzPSRJdFA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389529AbfA1QqB (ORCPT ); Mon, 28 Jan 2019 11:46:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:58880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389267AbfA1QWs (ORCPT ); Mon, 28 Jan 2019 11:22:48 -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 EB2342173C; Mon, 28 Jan 2019 16:22:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692567; bh=KftWaf79M1TdAqLT2vstyxJ40HAEndbnI/Z53sTFsdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hi0vjoAnnw0DrSUsHc9k9/Y/H/6aDTerGMlKD89GQyv0m/Dcb2lpqca0ds1CUwmbA 0QehQsU91mcv8o0wFk5eDxPcPgt+BgwDb1PyWN1tLphmWAm2Aso2BVdYq1cMwFbGiE Y7xHIvvly3jJTemtBMgH0w6r7XowZJzpeiRAH2H0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dave Carroll , Don Brace , "Martin K . Petersen" , Sasha Levin , esc.storagedev@microsemi.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 069/107] scsi: smartpqi: correct volume status Date: Mon, 28 Jan 2019 11:19:09 -0500 Message-Id: <20190128161947.57405-69-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161947.57405-1-sashal@kernel.org> References: <20190128161947.57405-1-sashal@kernel.org> MIME-Version: 1.0 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: Dave Carroll [ Upstream commit 7ff44499bafbd376115f0bb6b578d980f56ee13b ] - fix race condition when a unit is deleted after an RLL, and before we have gotten the LV_STATUS page of the unit. - In this case we will get a standard inquiry, rather than the desired page. This will result in a unit presented which no longer exists. - If we ask for LV_STATUS, insure we get LV_STATUS Reviewed-by: Murthy Bhat Reviewed-by: Mahesh Rajashekhara Reviewed-by: Scott Teel Reviewed-by: Kevin Barnett Signed-off-by: Dave Carroll Signed-off-by: Don Brace Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 9a208961cc0b..06a062455404 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -983,6 +983,9 @@ static void pqi_get_volume_status(struct pqi_ctrl_info *ctrl_info, if (rc) goto out; + if (vpd->page_code != CISS_VPD_LV_STATUS) + goto out; + page_length = offsetof(struct ciss_vpd_logical_volume_status, volume_status) + vpd->page_length; if (page_length < sizeof(*vpd)) -- 2.19.1