sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SecurityPkg: Fix incorrect return value when File is NULL

Browse Source 
The DxeTpmMeasureBootHandler and DxeTpm2MeasureBootHandler handlers
are SECURITY2_FILE_AUTHENTICATION_HANDLER prototype. This prototype
can not return EFI_INVALID_PARAMETER.

The prototype documentation states it returns EFI_ACCESS_DENIED if:

  "The file specified by File and FileBuffer did not authenticate,
   and the platform policy dictates that the DXE Foundation may not
   use File."

Correct the documentation, and add a early check, returning
EFI_ACCESS_DENIED when File is NULL.

Noticed while reviewing commit 6d57592740.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
This commit is contained in:
Philippe Mathieu-Daudé
2020-02-07 08:04:33 +00:00
committed by mergify[bot]
parent b34ed98694
commit 4b026f0d5a
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
View File

@@ -384,7 +384,7 @@ Finish:
and other exception operations. The File parameter allows for possible logging and other exception operations. The File parameter allows for possible logging
within the SAP of the driver. within the SAP of the driver.
If File is NULL, then EFI_INVALID_PARAMETER is returned. If File is NULL, then EFI_ACCESS_DENIED is returned.
If the file specified by File with an authentication status specified by If the file specified by File with an authentication status specified by
AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned. AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned.
@@ -435,6 +435,13 @@ DxeTpm2MeasureBootHandler (
EFI_PHYSICAL_ADDRESS FvAddress; EFI_PHYSICAL_ADDRESS FvAddress;
UINT32 Index; UINT32 Index;
//
// Check for invalid parameters.
//
if (File == NULL) {
return EFI_ACCESS_DENIED;
}
Status = gBS->LocateProtocol (&gEfiTcg2ProtocolGuid, NULL, (VOID **) &Tcg2Protocol); Status = gBS->LocateProtocol (&gEfiTcg2ProtocolGuid, NULL, (VOID **) &Tcg2Protocol);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
// //

9
SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
View File

@@ -678,7 +678,7 @@ Finish:
and other exception operations. The File parameter allows for possible logging and other exception operations. The File parameter allows for possible logging
within the SAP of the driver. within the SAP of the driver.
If File is NULL, then EFI_INVALID_PARAMETER is returned. If File is NULL, then EFI_ACCESS_DENIED is returned.
If the file specified by File with an authentication status specified by If the file specified by File with an authentication status specified by
AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned. AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned.
@@ -732,6 +732,13 @@ DxeTpmMeasureBootHandler (
EFI_PHYSICAL_ADDRESS FvAddress; EFI_PHYSICAL_ADDRESS FvAddress;
UINT32 Index; UINT32 Index;
//
// Check for invalid parameters.
//
if (File == NULL) {
return EFI_ACCESS_DENIED;
}
Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **) &TcgProtocol); Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **) &TcgProtocol);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
// //