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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 9F203C47E4D for ; Wed, 14 Jul 2021 20:00:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A7BF610D1 for ; Wed, 14 Jul 2021 20:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239525AbhGNUCw (ORCPT ); Wed, 14 Jul 2021 16:02:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:47274 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240898AbhGNTuL (ORCPT ); Wed, 14 Jul 2021 15:50:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2A7AA61453; Wed, 14 Jul 2021 19:46:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291978; bh=HUKhC0Z0A+WPSxdT6LAgFeO61IKhQx4Z+w6Fm2TciYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fO6YV6EwjbYBOtvMVcmD9defGV2Hm/ZP/z2HrHLYabPTu4pyeFDmjRJUuJQOQB9wg QX8epgtmyZFBrzoJbZw3aJE9FZx8KjJaVimTeblsvu+SudFkeGNh28IrVmJHZyfTxv fJ5E+ZipnQedTyH5q8B8vK5Svpgat2lXRSu2S/tROPkM5xYla6IFJUPcHM/7AjQq/P OvDtILKApO4EgodaXU0NzswOAYCNN1R1Gd3B1BrIY69iRuZYIGyvF0/HOuNmed2NZB rOrom9xvGsQXi574zIsQOuCDlaEiFWqSC0efBGnk93tEDgYs514ZDLODlJCuEaTH+C Dn2s09CoRUmcg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Javed Hasan , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 47/51] scsi: libfc: Fix array index out of bound exception Date: Wed, 14 Jul 2021 15:45:09 -0400 Message-Id: <20210714194513.54827-47-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194513.54827-1-sashal@kernel.org> References: <20210714194513.54827-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Javed Hasan [ Upstream commit b27c4577557045f1ab3cdfeabfc7f3cd24aca1fe ] Fix array index out of bound exception in fc_rport_prli_resp(). Link: https://lore.kernel.org/r/20210615165939.24327-1-jhasan@marvell.com Signed-off-by: Javed Hasan Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/libfc/fc_rport.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c index 64500417c22e..326bd609a3d1 100644 --- a/drivers/scsi/libfc/fc_rport.c +++ b/drivers/scsi/libfc/fc_rport.c @@ -1160,6 +1160,7 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, resp_code = (pp->spp.spp_flags & FC_SPP_RESP_MASK); FC_RPORT_DBG(rdata, "PRLI spp_flags = 0x%x spp_type 0x%x\n", pp->spp.spp_flags, pp->spp.spp_type); + rdata->spp_type = pp->spp.spp_type; if (resp_code != FC_SPP_RESP_ACK) { if (resp_code == FC_SPP_RESP_CONF) @@ -1182,11 +1183,13 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, /* * Call prli provider if we should act as a target */ - prov = fc_passive_prov[rdata->spp_type]; - if (prov) { - memset(&temp_spp, 0, sizeof(temp_spp)); - prov->prli(rdata, pp->prli.prli_spp_len, - &pp->spp, &temp_spp); + if (rdata->spp_type < FC_FC4_PROV_SIZE) { + prov = fc_passive_prov[rdata->spp_type]; + if (prov) { + memset(&temp_spp, 0, sizeof(temp_spp)); + prov->prli(rdata, pp->prli.prli_spp_len, + &pp->spp, &temp_spp); + } } /* * Check if the image pair could be established -- 2.30.2