From patchwork Mon Aug 21 13:00:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nilesh Javali X-Patchwork-Id: 716409 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BE65EE4993 for ; Mon, 21 Aug 2023 13:01:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235175AbjHUNBR (ORCPT ); Mon, 21 Aug 2023 09:01:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235176AbjHUNBN (ORCPT ); Mon, 21 Aug 2023 09:01:13 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 924F4D1 for ; Mon, 21 Aug 2023 06:01:12 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37LCMJmV010965 for ; Mon, 21 Aug 2023 06:01:11 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=ZnsC1hmtUORW8dXT47QOPEPHZ1j9fm2/WoVk5ourfZo=; b=hCZgJy+s2jscTHiFbez5Ix3oVjXkxYrwI/UpLEAzM+epXUhQaocf1MamDNnDSglOO5tF WvgWo4zVroCJhZu24ofcp8YNmAlg5fuEb3pz7NdbiMz8MPsyq0Hn3y8JQQma2yPEuqwZ 7A63ZQdx1AF9h7PR1Comx8FAteU6Ab9pnWZUlqqJDmmECORzgEfQ7TgM0zQF8ffKt3OX +gzJp/QUKB7WTR3dzl7s7F9KBs6ZptSH9nFYyyTVVJEBp5oTulfJ9HPfMOO5FQyJjm4F HxgrGn8VglE9HfMS3bJEkwLaN03MVjDR7aJdPmXkTEsyyOCmWXIVV3rBoZbIG9MUa4DN dQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3sjw8jcs5h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 21 Aug 2023 06:01:11 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Mon, 21 Aug 2023 06:01:09 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Mon, 21 Aug 2023 06:01:09 -0700 Received: from localhost.marvell.com (unknown [10.30.46.195]) by maili.marvell.com (Postfix) with ESMTP id 763AC3F7091; Mon, 21 Aug 2023 06:01:07 -0700 (PDT) From: Nilesh Javali To: CC: , , , Subject: [PATCH v3 8/9] Revert "scsi: qla2xxx: Fix buffer overrun" Date: Mon, 21 Aug 2023 18:30:44 +0530 Message-ID: <20230821130045.34850-9-njavali@marvell.com> X-Mailer: git-send-email 2.23.1 In-Reply-To: <20230821130045.34850-1-njavali@marvell.com> References: <20230821130045.34850-1-njavali@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: sM10EPjUtw2L8cSiIJkA3JefwnIcha_k X-Proofpoint-GUID: sM10EPjUtw2L8cSiIJkA3JefwnIcha_k X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-08-21_01,2023-08-18_01,2023-05-22_02 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Revert due to Get PLOGI Template failed. This reverts commit b68710a8094fdffe8dd4f7a82c82649f479bb453. Cc: stable@vger.kernel.org Signed-off-by: Nilesh Javali Reviewed-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 62087ce51b3f..d4df07aaa0ab 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -5607,7 +5607,7 @@ static void qla_get_login_template(scsi_qla_host_t *vha) __be32 *q; memset(ha->init_cb, 0, ha->init_cb_size); - sz = min_t(int, sizeof(struct fc_els_csp), ha->init_cb_size); + sz = min_t(int, sizeof(struct fc_els_flogi), ha->init_cb_size); rval = qla24xx_get_port_login_templ(vha, ha->init_cb_dma, ha->init_cb, sz); if (rval != QLA_SUCCESS) {