tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NetworkPkg/TlsDxe: Add the support of host validation to TlsDxe driver (CVE-2019-14553) 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=960
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 <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Long Qin <qin.long@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20190927034441.3096-4-Jiaxin.wu@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Sivaraman Nainar <sivaramann@amiindia.co.in>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Wu, Jiaxin 2019-09-27 11:44:40 +08:00 committed by Laszlo Ersek
parent 1e72b1fb2e
commit 703e7ab21f
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
NetworkPkg/TlsDxe/TlsProtocol.c
View File

@ -1,7 +1,7 @@
/** @file
Implementation of EFI TLS Protocol Interfaces.
Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@ -56,12 +56,16 @@ TlsSetSessionData (
UINT16 *CipherId;
CONST EFI_TLS_CIPHER *TlsCipherList;
UINTN CipherCount;
CONST EFI_TLS_VERIFY_HOST *TlsVerifyHost;
EFI_TLS_VERIFY VerifyMethod;
UINTN VerifyMethodSize;
UINTN Index;
EFI_TPL OldTpl;
Status = EFI_SUCCESS;
CipherId = NULL;
Status = EFI_SUCCESS;
CipherId = NULL;
VerifyMethodSize = sizeof (EFI_TLS_VERIFY);
if (This == NULL || Data == NULL || DataSize == 0) {
return EFI_INVALID_PARAMETER;
@ -148,6 +152,40 @@ TlsSetSessionData (
}
TlsSetVerify (Instance->TlsConn, *((UINT32 *) Data));
break;
case EfiTlsVerifyHost:
if (DataSize != sizeof (EFI_TLS_VERIFY_HOST)) {
Status = EFI_INVALID_PARAMETER;
goto ON_EXIT;
}
TlsVerifyHost = (CONST EFI_TLS_VERIFY_HOST *) Data;
if ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_ALWAYS_CHECK_SUBJECT) != 0 &&
(TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NEVER_CHECK_SUBJECT) != 0) {
Status = EFI_INVALID_PARAMETER;
goto ON_EXIT;
}
if ((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NO_WILDCARDS) != 0 &&
((TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_NO_PARTIAL_WILDCARDS) != 0 ||
(TlsVerifyHost->Flags & EFI_TLS_VERIFY_FLAG_MULTI_LABEL_WILDCARDS) != 0)) {
Status = EFI_INVALID_PARAMETER;
goto ON_EXIT;
}
Status = This->GetSessionData (This, EfiTlsVerifyMethod, &VerifyMethod, &VerifyMethodSize);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
if ((VerifyMethod & EFI_TLS_VERIFY_PEER) == 0) {
Status = EFI_INVALID_PARAMETER;
goto ON_EXIT;
}
Status = TlsSetVerifyHost (Instance->TlsConn, TlsVerifyHost->Flags, TlsVerifyHost->HostName);
break;
case EfiTlsSessionID:
if (DataSize != sizeof (EFI_TLS_SESSION_ID)) {