From nobody Sun Feb 8 22:35:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+76200+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76200+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623154394; cv=none; d=zohomail.com; s=zohoarc; b=GuGMb0QOBX/5bLtstiAUd8xshoGr6ield7WTFsdQGXufwtNtIxfs16m2lJmR44aLfg2udbmq2rCzHelm9zHAaYc2dAc3Rz+qfAqzP78BoaC19ddpzlIG08UVbMDVxor3Tll1cOEc1u4Mim8rf3fP1dp1hTMuoYw5KCd9hdKj0o0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623154394; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=n/kzYdIRz/CT4ClyXKRlUN6k5zSE46r8bb6njuG969g=; b=MdCgYFf9Bnh8MRwMPdYk170lNI/ZzyXzV7i4bE0IBYxejQkochabtmp2PYftHJ+WEXIzxQn6gzza33uILIovomafOKufW2NWsVMrSJ88odsUkQ3D1NjreGx1gRB8/zbBb0PljaMIz1SAmNFzlYa4KIZazZs/1OHYcDG3keIYhCU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76200+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16231543948581002.5282240471261; Tue, 8 Jun 2021 05:13:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZcGBYY1788612xt1gwf58kOP; Tue, 08 Jun 2021 05:13:14 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web08.11304.1623154388421637847 for ; Tue, 08 Jun 2021 05:13:08 -0700 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-338-0v7XXF6IMviM9L0Bo1arMA-1; Tue, 08 Jun 2021 08:13:06 -0400 X-MC-Unique: 0v7XXF6IMviM9L0Bo1arMA-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37BC5106BAAC; Tue, 8 Jun 2021 12:13:05 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-27.ams2.redhat.com [10.36.113.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED48D620DE; Tue, 8 Jun 2021 12:13:03 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jiaxin Wu , Maciej Rabeda , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Siyuan Fu Subject: [edk2-devel] [PUBLIC edk2 PATCH v2 02/10] NetworkPkg/IScsiDxe: simplify "ISCSI_CHAP_AUTH_DATA.InChallenge" size Date: Tue, 8 Jun 2021 14:12:51 +0200 Message-Id: <20210608121259.32451-3-lersek@redhat.com> In-Reply-To: <20210608121259.32451-1-lersek@redhat.com> References: <20210608121259.32451-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: P7eVGHPakOW8uMEX4OMECVUBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1623154394; bh=n/kzYdIRz/CT4ClyXKRlUN6k5zSE46r8bb6njuG969g=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=stnFz6iqdJpVPHhpkF1+8m8PRhgM/WlNMHMxeuQ4HewhyG625+/Dh3BKURBLmO17W31 DsUVVxi4BxaOmtZQlxnT3ALUXDSutLs5DiEVrz/oPw5FHGvQBjvISqOxKPKqDpogxYtHn DBzVPHlFWREd7ghFc4/t8WNMbyGhcum6YkA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The ISCSI_CHAP_AUTH_MAX_LEN macro is defined with value 1024. The usage of this macro currently involves a semantic (not functional) bug, which we're going to fix in a subsequent patch, eliminating ISCSI_CHAP_AUTH_MAX_LEN altogether. For now, remove the macro's usage from all "ISCSI_CHAP_AUTH_DATA.InChallenge" contexts. This is doable without duplicating open-coded constants. No changes in functionality. Cc: Jiaxin Wu Cc: Maciej Rabeda Cc: Philippe Mathieu-Daud=C3=A9 Cc: Siyuan Fu Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3356 Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Maciej Rabeda --- NetworkPkg/IScsiDxe/IScsiCHAP.h | 2 +- NetworkPkg/IScsiDxe/IScsiCHAP.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.h b/NetworkPkg/IScsiDxe/IScsiCHA= P.h index 5e59fb678bd7..1fc1d96ea3f3 100644 --- a/NetworkPkg/IScsiDxe/IScsiCHAP.h +++ b/NetworkPkg/IScsiDxe/IScsiCHAP.h @@ -33,39 +33,39 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #pragma pack(1) =20 typedef struct _ISCSI_CHAP_AUTH_CONFIG_NVDATA { UINT8 CHAPType; CHAR8 CHAPName[ISCSI_CHAP_NAME_STORAGE]; CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_STORAGE]; CHAR8 ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE]; CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE]; } ISCSI_CHAP_AUTH_CONFIG_NVDATA; =20 #pragma pack() =20 /// /// ISCSI CHAP Authentication Data /// typedef struct _ISCSI_CHAP_AUTH_DATA { ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfig; UINT32 InIdentifier; - UINT8 InChallenge[ISCSI_CHAP_AUTH_MAX_LEN]; + UINT8 InChallenge[1024]; UINT32 InChallengeLength; // // Calculated CHAP Response (CHAP_R) value. // UINT8 CHAPResponse[ISCSI_CHAP_RSP_LEN]; =20 // // Auth-data to be sent out for mutual authentication. // UINT32 OutIdentifier; UINT8 OutChallenge[ISCSI_CHAP_AUTH_MAX_LEN]; UINT32 OutChallengeLength; } ISCSI_CHAP_AUTH_DATA; =20 /** This function checks the received iSCSI Login Response during the securi= ty negotiation stage. =20 @param[in] Conn The iSCSI connection. diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.c b/NetworkPkg/IScsiDxe/IScsiCHA= P.c index cbbc56ae5b43..df3c2eb1200a 100644 --- a/NetworkPkg/IScsiDxe/IScsiCHAP.c +++ b/NetworkPkg/IScsiDxe/IScsiCHAP.c @@ -273,39 +273,39 @@ IScsiCHAPOnRspReceived ( } =20 Challenge =3D IScsiGetValueByKeyFromList ( KeyValueList, ISCSI_KEY_CHAP_CHALLENGE ); if (Challenge =3D=3D NULL) { goto ON_EXIT; } // // Process the CHAP identifier and CHAP Challenge from Target. // Calculate Response value. // Result =3D IScsiNetNtoi (Identifier); if (Result > 0xFF) { goto ON_EXIT; } =20 AuthData->InIdentifier =3D (UINT32) Result; - AuthData->InChallengeLength =3D ISCSI_CHAP_AUTH_MAX_LEN; + AuthData->InChallengeLength =3D (UINT32) sizeof (AuthData->InChallenge= ); IScsiHexToBin ( (UINT8 *) AuthData->InChallenge, &AuthData->InChallengeLength, Challenge ); Status =3D IScsiCHAPCalculateResponse ( AuthData->InIdentifier, AuthData->AuthConfig->CHAPSecret, (UINT32) AsciiStrLen (AuthData->AuthConfig->CHAPSecret), AuthData->InChallenge, AuthData->InChallengeLength, AuthData->CHAPResponse ); =20 // // Transit to next step. // Conn->AuthStep =3D ISCSI_CHAP_STEP_THREE; break; --=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76200): https://edk2.groups.io/g/devel/message/76200 Mute This Topic: https://groups.io/mt/83394108/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-