From patchwork Wed Jun 7 11:38:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nilesh Javali X-Patchwork-Id: 690464 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 C890AC7EE23 for ; Wed, 7 Jun 2023 11:38:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239236AbjFGLiz (ORCPT ); Wed, 7 Jun 2023 07:38:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234009AbjFGLix (ORCPT ); Wed, 7 Jun 2023 07:38:53 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 787C51730 for ; Wed, 7 Jun 2023 04:38:52 -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 357BJ2oO031500 for ; Wed, 7 Jun 2023 04:38:51 -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=vyqA+968Q2J/pa5licXy9hgFul+fFkQiqowy81dDv6I=; b=GG84fXsp3iaklmAX6yJmVDnJRSg75eyJ9woIiUHrSeDeEIyRXVUO+/ZCFZZ0F5SXG4SH 56nQmW0UFSj4Xoyi833HFu8t0nAI4CMT6z6io/cQodT9DCA2uHnl5B7nw+hmokROuK3x qKIEm8W2abTQ8S9O6W9VHajnXJwhxkdlSNcAKpIY/I7IjOG8k/Q0OBELysZvrA/T0Otd 6nlIBWteHQBw/uYQa2Nfk+HPpK9+dSXqLIKkMqAUEyqsB0uud003urFnqjBclzUOE2Vg hVBFRwa4W5fhcTLrU4s2S795WoBWhT2wp8zlIzhU15DYsMIsORhISu5pAhhEHHWi5Fnv rw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3r2a75afec-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 07 Jun 2023 04:38:51 -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; Wed, 7 Jun 2023 04:38:49 -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; Wed, 7 Jun 2023 04:38:49 -0700 Received: from localhost.marvell.com (unknown [10.30.46.195]) by maili.marvell.com (Postfix) with ESMTP id 604593F706F; Wed, 7 Jun 2023 04:38:47 -0700 (PDT) From: Nilesh Javali To: CC: , , , Subject: [PATCH v2 1/8] qla2xxx: klocwork - Array index may go out of bound Date: Wed, 7 Jun 2023 17:08:36 +0530 Message-ID: <20230607113843.37185-2-njavali@marvell.com> X-Mailer: git-send-email 2.23.1 In-Reply-To: <20230607113843.37185-1-njavali@marvell.com> References: <20230607113843.37185-1-njavali@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: UXS3UgPSMFnNUcsUP8FYolZ1rgM87qJK X-Proofpoint-GUID: UXS3UgPSMFnNUcsUP8FYolZ1rgM87qJK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-07_06,2023-06-07_01,2023-05-22_02 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Klocwork reports array 'vha->host_str' of size 16 may use index value(s) 16..19. Use snprintf instead of sprintf. Cc: stable@vger.kernel.org Signed-off-by: Bikash Hazarika Signed-off-by: Nilesh Javali Reviewed-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index bc89d3da8fd0..3bace9ea6288 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -5088,7 +5088,8 @@ struct scsi_qla_host *qla2x00_create_host(const struct scsi_host_template *sht, } INIT_DELAYED_WORK(&vha->scan.scan_work, qla_scan_work_fn); - sprintf(vha->host_str, "%s_%lu", QLA2XXX_DRIVER_NAME, vha->host_no); + snprintf(vha->host_str, sizeof(vha->host_str), "%s_%lu", + QLA2XXX_DRIVER_NAME, vha->host_no); ql_dbg(ql_dbg_init, vha, 0x0041, "Allocated the host=%p hw=%p vha=%p dev_name=%s", vha->host, vha->hw, vha, From patchwork Wed Jun 7 11:38:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nilesh Javali X-Patchwork-Id: 690463 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 0833EC77B7A for ; Wed, 7 Jun 2023 11:39:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240350AbjFGLjB (ORCPT ); Wed, 7 Jun 2023 07:39:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239248AbjFGLi6 (ORCPT ); Wed, 7 Jun 2023 07:38:58 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA0911730 for ; Wed, 7 Jun 2023 04:38:56 -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 357BJ4p1031514 for ; Wed, 7 Jun 2023 04:38:56 -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=5nkASTIqk8AB/F341bpDn9STBvBqOPhEuLTK1T0HABQ=; b=HCqkOmQlrh5ZkQe+jcHpPSLuYRVnvECqUQQpBtpJ97wYZsS2KakSc3lk7kWCgeopRU0N fS9hF3S2zXf8a8Ndhn8ZlO/JWXTyyuZhD0DGdFA7o+KoeHLK7UcDRvJBfsOYpU2vtTeH pPPh+uufRQrNVSyG0Fo+CrDZBf0h9T41B+hyE9nI5223iwda8nnq8OB9JfYrruYotE2j s8UvxkOOV+R1fNXqkr0YSdwVBsz3p8IkqPLyxY0RTzmdiGruq6zR6savTWK+GXTATWF+ YBZuhR0K0qEnRBYaZaOA18+R9J+/7zsSmKfRvppGZPv0yFq4tTxeTD4pW+2fwkaSkOrc Yg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3r2a75aff0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 07 Jun 2023 04:38:56 -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; Wed, 7 Jun 2023 04:38:53 -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; Wed, 7 Jun 2023 04:38:53 -0700 Received: from localhost.marvell.com (unknown [10.30.46.195]) by maili.marvell.com (Postfix) with ESMTP id 17D2E3F7045; Wed, 7 Jun 2023 04:38:51 -0700 (PDT) From: Nilesh Javali To: CC: , , , Subject: [PATCH v2 3/8] qla2xxx: klocwork - avoid fcport pointer dereference Date: Wed, 7 Jun 2023 17:08:38 +0530 Message-ID: <20230607113843.37185-4-njavali@marvell.com> X-Mailer: git-send-email 2.23.1 In-Reply-To: <20230607113843.37185-1-njavali@marvell.com> References: <20230607113843.37185-1-njavali@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: DLw3fLAuA6rHX7KhGx_CS1aFAC9Gjql- X-Proofpoint-GUID: DLw3fLAuA6rHX7KhGx_CS1aFAC9Gjql- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-07_06,2023-06-07_01,2023-05-22_02 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Klocwork reported warning of null pointer may be dereferenced. The routine exits when sa_ctl is NULL and fcport is allocated after the exit call thus causing NULL fcport pointer to dereference at the time of exit. To avoid fcport pointer dereference, exit the routine when sa_ctl is NULL. Cc: stable@vger.kernel.org Signed-off-by: Nilesh Javali Reviewed-by: Himanshu Madhani --- v2: - Exit the routine if sa_ctl is NULL. drivers/scsi/qla2xxx/qla_edif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_edif.c b/drivers/scsi/qla2xxx/qla_edif.c index ec0e20255bd3..26e6b3e3af43 100644 --- a/drivers/scsi/qla2xxx/qla_edif.c +++ b/drivers/scsi/qla2xxx/qla_edif.c @@ -2361,8 +2361,8 @@ qla24xx_issue_sa_replace_iocb(scsi_qla_host_t *vha, struct qla_work_evt *e) if (!sa_ctl) { ql_dbg(ql_dbg_edif, vha, 0x70e6, "sa_ctl allocation failed\n"); - rval = -ENOMEM; - goto done; + rval = -ENOMEM; + return rval; } fcport = sa_ctl->fcport; From patchwork Wed Jun 7 11:38:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nilesh Javali X-Patchwork-Id: 690462 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 6B44FC7EE23 for ; Wed, 7 Jun 2023 11:39:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240074AbjFGLjF (ORCPT ); Wed, 7 Jun 2023 07:39:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239248AbjFGLjB (ORCPT ); Wed, 7 Jun 2023 07:39:01 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1D441BC5 for ; Wed, 7 Jun 2023 04:39:00 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3576rbXk024822 for ; Wed, 7 Jun 2023 04:39:00 -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=502PJnjz9uwM4sa04gsCwmAxUMVS7kt70KMIlpfpMls=; b=i9dNSJx6iVM26FdBxkVPtNKSS2osyZINItsU0qMny8NpGG2qM697nlwFxSuwOrLs5U+1 LAK/Aj4FJmqvJWghXbTCwawdtj/aisd838DfyuvqNKrfpw8h8CH4cHf7zzq8eUsIevdb +IZPX/9i8D+0lfc/O6D3MQusteeLSufbzcdzpyGmAOsQgfuWWN8MN9xIvdJGHyo9DZqZ elunbMykK5GVB+ewutkIjpq0B8wiDI0qxa1RE24xVLGfYHG2UESRl9wournvcZbFqZqv RhVIzIW8QG0G0eW+JQu+r12PlrpzVXn26hIWuIL2oXNrjRC1L47y5MvbOyWqoWNLfSY9 +A== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3r2a7bu9c8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 07 Jun 2023 04:39:00 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Wed, 7 Jun 2023 04:38:58 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Wed, 7 Jun 2023 04:38:58 -0700 Received: from localhost.marvell.com (unknown [10.30.46.195]) by maili.marvell.com (Postfix) with ESMTP id B8BAA3F7045; Wed, 7 Jun 2023 04:38:56 -0700 (PDT) From: Nilesh Javali To: CC: , , , Subject: [PATCH v2 5/8] qla2xxx: klocwork - Fix buffer overrun Date: Wed, 7 Jun 2023 17:08:40 +0530 Message-ID: <20230607113843.37185-6-njavali@marvell.com> X-Mailer: git-send-email 2.23.1 In-Reply-To: <20230607113843.37185-1-njavali@marvell.com> References: <20230607113843.37185-1-njavali@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: ORDecV5bEExwRI6ZF5yPr6MJM1UuyGtH X-Proofpoint-GUID: ORDecV5bEExwRI6ZF5yPr6MJM1UuyGtH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-07_06,2023-06-07_01,2023-05-22_02 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Quinn Tran Klocwork warning: Buffer Overflow - Array Index Out of Bounds Driver uses fc_els_flogi to calculate size of buffer. The actual buffer is nested inside of fc_els_flogi which is smaller. Replace structure name to allow proper size calculation. Cc: stable@vger.kernel.org Signed-off-by: Quinn Tran 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 0df6eae7324e..b0225f6f3221 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -5549,7 +5549,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_flogi), ha->init_cb_size); + sz = min_t(int, sizeof(struct fc_els_csp), ha->init_cb_size); rval = qla24xx_get_port_login_templ(vha, ha->init_cb_dma, ha->init_cb, sz); if (rval != QLA_SUCCESS) { From patchwork Wed Jun 7 11:38:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nilesh Javali X-Patchwork-Id: 690461 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 3896EC77B7A for ; Wed, 7 Jun 2023 11:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240352AbjFGLjL (ORCPT ); Wed, 7 Jun 2023 07:39:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240361AbjFGLjH (ORCPT ); Wed, 7 Jun 2023 07:39:07 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76F821BC2 for ; Wed, 7 Jun 2023 04:39:05 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3577A1m1024709 for ; Wed, 7 Jun 2023 04:39:05 -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=7hGjshKoALcK0hxFivvXqkrl2g5lZHLyAee4e+ZjdJU=; b=a1SiPPHMQvy2776upwcyW1CoOUNGnqMrjhU5FmkmwWAgbTVYi8Cf4nEhUH6r0/jbU7Hj YI1CTMPriCkb1VR5bA0Y3YTkTqicMlwxeCqQVQvkhhAWc4Licqp4W5u5xpQ7oqd4VzhN Gr49ZqevNEPcW21HFPM3COkf+LAUusibJmToOQqiHZxCqiJILXLriUDhH/jn/mJMbmYj Bnzr2vVV3W+vhMIJRh2N8aed7Uh/Z+ynvmCLSI5W9qcKIe6G2heJF7TfQjhqdwQsPO6h JibDMt5O3DXd+kac/FmJN7ZrdLRoReoxZftf+QKcrYB4Z7gDGV9/+oyGOBTktow0pphD nA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3r2a7bu9cq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 07 Jun 2023 04:39:05 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Wed, 7 Jun 2023 04:39:03 -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; Wed, 7 Jun 2023 04:39:03 -0700 Received: from localhost.marvell.com (unknown [10.30.46.195]) by maili.marvell.com (Postfix) with ESMTP id 9CEF23F7076; Wed, 7 Jun 2023 04:39:01 -0700 (PDT) From: Nilesh Javali To: CC: , , , Subject: [PATCH v2 7/8] qla2xxx: klocwork - correct the index of array Date: Wed, 7 Jun 2023 17:08:42 +0530 Message-ID: <20230607113843.37185-8-njavali@marvell.com> X-Mailer: git-send-email 2.23.1 In-Reply-To: <20230607113843.37185-1-njavali@marvell.com> References: <20230607113843.37185-1-njavali@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 1qQ7UFJRmeoaDWf60VBGbZ8XtjzUpSMj X-Proofpoint-GUID: 1qQ7UFJRmeoaDWf60VBGbZ8XtjzUpSMj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-07_06,2023-06-07_01,2023-05-22_02 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Bikash Hazarika Klocwork reported array 'port_dstate_str' of size 10 may use index value(s) 10..15. Add a fix to correct the index of array. Cc: stable@vger.kernel.org Signed-off-by: Bikash Hazarika Signed-off-by: Nilesh Javali Reviewed-by: Himanshu Madhani --- v2: - Remove the outer parenthesis. drivers/scsi/qla2xxx/qla_inline.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index cce6e425c121..946a39504a35 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h @@ -109,11 +109,13 @@ qla2x00_set_fcport_disc_state(fc_port_t *fcport, int state) { int old_val; uint8_t shiftbits, mask; + uint8_t port_dstate_str_sz; /* This will have to change when the max no. of states > 16 */ shiftbits = 4; mask = (1 << shiftbits) - 1; + port_dstate_str_sz = sizeof(port_dstate_str) / sizeof(char *); fcport->disc_state = state; while (1) { old_val = atomic_read(&fcport->shadow_disc_state); @@ -121,7 +123,8 @@ qla2x00_set_fcport_disc_state(fc_port_t *fcport, int state) old_val, (old_val << shiftbits) | state)) { ql_dbg(ql_dbg_disc, fcport->vha, 0x2134, "FCPort %8phC disc_state transition: %s to %s - portid=%06x.\n", - fcport->port_name, port_dstate_str[old_val & mask], + fcport->port_name, (old_val & mask) < port_dstate_str_sz ? + port_dstate_str[old_val & mask] : "Unknown", port_dstate_str[state], fcport->d_id.b24); return; }