From nobody Fri May 17 05:26:17 2024 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+105691+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+105691+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1685946616; cv=none; d=zohomail.com; s=zohoarc; b=Up7lbVoFG3PaG1MlStTlpD6XJnt+2gCEJnXc/Vv5s4ZiRTmKACRXDWvugArHILtBSpKXpE9YnXlYxQAw7ReJF/bmodKOLTAxw4IAocuS2ynF+fCl9X1vgL6ZlAQpwkKXeWBI1v7OMg4wIwhnxwoskbMLI5hX7JxJktwR8vYUNnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685946616; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=/AuTcTkO9ABg6cWcRlVnZ5QurbIHd3EdqK5BGs6e+HI=; b=ZANy/kQ/oVQoMQVWuCgapLE1UGXwZ+EVh8FEvsz7vCCykqV86Tsue/gE5HZ5OZ7QafI2vm8qDI3WFaKuHsdkST4Pk8YkH8ad+PuOpICwEeCIGnavBJZCj40ji1rjG5qi2XdUZjQyYbWD+eDFFKfrPgFac41F+Hj2IyDH4BSqUP0= 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+105691+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1685946616069644.8959403726496; Sun, 4 Jun 2023 23:30:16 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id eljHYY1788612xCoLPTBt8oW; Sun, 04 Jun 2023 23:30:15 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.1334.1685946613916743769 for ; Sun, 04 Jun 2023 23:30:14 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="384593533" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="384593533" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2023 23:30:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="686003332" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="686003332" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.10]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2023 23:30:11 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Yi Li , Maciej Rabeda , Siyuan Fu Subject: [edk2-devel] [PATCH] NetworkPkg: Correct the length of EAP Identity when in ASCII format Date: Mon, 5 Jun 2023 14:29:57 +0800 Message-Id: <20230605062957.8331-1-yi1.li@intel.com> MIME-Version: 1.0 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,yi1.li@intel.com X-Gm-Message-State: FfyMTPUtotRUAhmstPiJTIBsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1685946615; bh=KyAaFc7AFwmNBSqeDCuHBcZVnccTKMnEp+GHJylazWw=; h=Cc:Date:From:Reply-To:Subject:To; b=Qy/w8HGnizm2LLKniWCyoxqrzt9PxdgGuoBsKzCWDm5WSaGxyOiLHuUO2uVlKosx+vR J0/7xq+eVT1wGgX0dUwRAXwZVZXvfy1HQEdFJYe6U+2hFv4h/SixYqAqocVs8rhaE4Gpj j2NAm2KTih5ZM6FQ/nhUo/uBn3fkEFLOlms= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1685946617142100003 Content-Type: text/plain; charset="utf-8" FIX: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4477 Tls connection fail over WiFi in AMT OCR flow due to invalid identity. This was due to missing conversion between unicode and ascii string which resulted in invalid strlen. Cc: Maciej Rabeda Cc: Siyuan Fu Signed-off-by: Yi Li --- .../WifiConnectionMgrImpl.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c b/= NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c index 2e596c1981..e1430251c8 100644 --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c @@ -572,7 +572,14 @@ WifiMgrConfigEap ( // Set Identity to Eap peer, Mandatory field for PEAP and TTLS // if (StrLen (Profile->EapIdentity) > 0) { - IdentitySize =3D sizeof (CHAR8) * (StrLen (Profile->EapIdentity) + 1); + Status =3D gBS->LocateProtocol (&gWiFiProfileSyncProtocolGuid, NULL, (= VOID **) &WiFiProfileSyncProtocol); + if (!EFI_ERROR (Status) && WiFiProfileSyncProtocol !=3D NULL) { + /* Max size of EapIdentity ::=3D sizeof (CHAR16) * sizeof (Profile->= EapIdentity) ::=3D 2 * EAP_IDENTITY_SIZE */ + IdentitySize =3D sizeof (CHAR8) * (AsciiStrnLenS ((CHAR8 *) Profile-= >EapIdentity, sizeof (CHAR16) * sizeof (Profile->EapIdentity)) + 1); + } else { + IdentitySize =3D sizeof (CHAR8) * (StrLen(Profile->EapIdentity) + 1); + } + Identity =3D AllocateZeroPool (IdentitySize); if (Identity =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; @@ -580,7 +587,10 @@ WifiMgrConfigEap ( =20 Status =3D gBS->LocateProtocol (&gEdkiiWiFiProfileSyncProtocolGuid, NU= LL, (VOID **)&WiFiProfileSyncProtocol); if (!EFI_ERROR (Status)) { - CopyMem (Identity, &Profile->EapIdentity, IdentitySize); + /* The size of Identity from Username may equal + to the max size of EapIdentity(EAP_IDENTITY_SIZE*2=3D128 bytes), + so here only valid characters except NULL characters are copied. = */ + CopyMem (Identity, &Profile->EapIdentity, IdentitySize - 1); } else { UnicodeStrToAsciiStrS (Profile->EapIdentity, Identity, IdentitySize); } --=20 2.31.1.windows.1 -=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 (#105691): https://edk2.groups.io/g/devel/message/105691 Mute This Topic: https://groups.io/mt/99335243/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-