From nobody Mon Feb 9 13:37:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49469+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49469+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1572068269; cv=none; d=zoho.com; s=zohoarc; b=LeeDWOryMca3es0/VxTDpuWoF+ZckgMvL82qK5D/SYjrLWI5YLXH9rEylIxpyFzW5rq3NAHGDRAy4sVq6krhvCA6Q7w5vjeAIz9715n8DIswljny3NWRfusgtdxWG9hvDiX1iv/9mFuhAREkOVyS1d6pTjw8nRRwvMxn1tVMnn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572068269; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=KlDDVYkqYw3kdv1Dhg4wW/8L2JDpAkLgOIrgbomy74I=; b=cmrAWz3RszCH72nUjJQhxC/S0pwtzHfIXhm5ripCY8b7C+YggEeCPYQW64is+/UUTnR4txtZvQ8NLYriUJ75wkk5p2tgq1MfldgkGbaUfyPOYhBZ0E95hoJgbkLt0s6U5YMuFVpVAJz+8vkbVWOpKLnQ1ujKU1mLfc+tv9FG+lo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49469+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572068269635207.3906421085528; Fri, 25 Oct 2019 22:37:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jHugYY1788612x9pDxkGQuDV; Fri, 25 Oct 2019 22:37:48 -0700 X-Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web09.2201.1572068268182942566 for ; Fri, 25 Oct 2019 22:37:48 -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-5-8rnWr0O-Nhya9zR-OE4jLQ-1; Sat, 26 Oct 2019 01:37:43 -0400 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20484800A02; Sat, 26 Oct 2019 05:37:42 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F2DF5D9CA; Sat, 26 Oct 2019 05:37:39 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: David Woodhouse , Jian J Wang , Jiaxin Wu , Sivaraman Nainar , Xiaoyu Lu Subject: [edk2-devel] [PATCH v2 7/8] NetworkPkg/TlsDxe: Add the support of host validation to TlsDxe driver (CVE-2019-14553) Date: Sat, 26 Oct 2019 07:37:18 +0200 Message-Id: <20191026053719.10453-8-lersek@redhat.com> In-Reply-To: <20191026053719.10453-1-lersek@redhat.com> References: <20191026053719.10453-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 8rnWr0O-Nhya9zR-OE4jLQ-1 X-Mimecast-Spam-Score: 0 Precedence: Bulk List-Unsubscribe: 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: u0a11hc73RZBKrvTCrezTuUnx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572068268; bh=Q1hM6VtatoiJS4DuEPD9I6E3Ku0rsJfRGa4MhdMuHS0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=og6bn/w2LwUSUWmumPLodNV4w59fnfWelqFobNjVIkqMdqrudKtoDVj8adprb14FYUu A3owy2VmgUZ8dKJj1WGzfyT31B0+OrOulNf65DFQVutkZW3bXqsN5CuCMPIElOc87NnHZ h+Wwz7F5IolxvYNvgotgAfvlHBqaeypwbNY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: "Wu, Jiaxin" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D960 CVE: CVE-2019-14553 The new data type named "EfiTlsVerifyHost" and the EFI_TLS_VERIFY_HOST_FLAG are supported in TLS protocol. Signed-off-by: Wu Jiaxin Reviewed-by: Ye Ting Reviewed-by: Long Qin Reviewed-by: Fu Siyuan Acked-by: Laszlo Ersek Message-Id: <20190927034441.3096-4-Jiaxin.wu@intel.com> Cc: David Woodhouse Cc: Jian J Wang Cc: Jiaxin Wu Cc: Sivaraman Nainar Cc: Xiaoyu Lu Signed-off-by: Laszlo Ersek --- Notes: v2: - fix whitespace in subject line - drop Contributed-under line per BZ#1373 NetworkPkg/TlsDxe/TlsProtocol.c | 44 ++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/NetworkPkg/TlsDxe/TlsProtocol.c b/NetworkPkg/TlsDxe/TlsProtoco= l.c index a7a993fc6fc5..001e5400d00f 100644 --- a/NetworkPkg/TlsDxe/TlsProtocol.c +++ b/NetworkPkg/TlsDxe/TlsProtocol.c @@ -1,8 +1,8 @@ /** @file Implementation of EFI TLS Protocol Interfaces. =20 - Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -55,14 +55,18 @@ TlsSetSessionData ( TLS_INSTANCE *Instance; UINT16 *CipherId; CONST EFI_TLS_CIPHER *TlsCipherList; UINTN CipherCount; + CONST EFI_TLS_VERIFY_HOST *TlsVerifyHost; + EFI_TLS_VERIFY VerifyMethod; + UINTN VerifyMethodSize; UINTN Index; =20 EFI_TPL OldTpl; =20 - Status =3D EFI_SUCCESS; - CipherId =3D NULL; + Status =3D EFI_SUCCESS; + CipherId =3D NULL; + VerifyMethodSize =3D sizeof (EFI_TLS_VERIFY); =20 if (This =3D=3D NULL || Data =3D=3D NULL || DataSize =3D=3D 0) { return EFI_INVALID_PARAMETER; } @@ -147,8 +151,42 @@ TlsSetSessionData ( goto ON_EXIT; } =20 TlsSetVerify (Instance->TlsConn, *((UINT32 *) Data)); + break; + case EfiTlsVerifyHost: + if (DataSize !=3D sizeof (EFI_TLS_VERIFY_HOST)) { + Status =3D EFI_INVALID_PARAMETER; + goto ON_EXIT; + } + + TlsVerifyHost =3D (CONST EFI_TLS_VERIFY_HOST *) Data; + + if ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_ALWAYS_CHECK_SUBJECT) = !=3D 0 && + (TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NEVER_CHECK_SUBJECT) != =3D 0) { + Status =3D EFI_INVALID_PARAMETER; + goto ON_EXIT; + } + + if ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NO_WILDCARDS) !=3D 0 && + ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NO_PARTIAL_WILDCARDS)= !=3D 0 || + (TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_MULTI_LABEL_WILDCARDS= ) !=3D 0)) { + Status =3D EFI_INVALID_PARAMETER; + goto ON_EXIT; + } + + Status =3D This->GetSessionData (This, EfiTlsVerifyMethod, &VerifyMeth= od, &VerifyMethodSize); + if (EFI_ERROR (Status)) { + goto ON_EXIT; + } + + if ((VerifyMethod & EFI_TLS_VERIFY_PEER) =3D=3D 0) { + Status =3D EFI_INVALID_PARAMETER; + goto ON_EXIT; + } + + Status =3D TlsSetVerifyHost (Instance->TlsConn, TlsVerifyHost->Flags, = TlsVerifyHost->HostName); + break; case EfiTlsSessionID: if (DataSize !=3D sizeof (EFI_TLS_SESSION_ID)) { Status =3D EFI_INVALID_PARAMETER; --=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 (#49469): https://edk2.groups.io/g/devel/message/49469 Mute This Topic: https://groups.io/mt/37952591/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-