1. Update AuthVarialbe driver to avoid integer overflow when using EFI_VARIABLE_AUTHENTICATION_2 descriptor.

Signed-off-by: sfu5
Reviewed-by: tye
Reviewed-by: gdong1

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13120 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
sfu5 2012-03-26 01:43:45 +00:00
parent d78fab6b4e
commit 6bc4e19fec
1 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@
The common variable operation routines shared by DXE_RINTIME variable The common variable operation routines shared by DXE_RINTIME variable
module and DXE_SMM variable module. module and DXE_SMM variable module.
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -2163,8 +2163,8 @@ VariableServiceSetVariable (
// Sanity check for EFI_VARIABLE_AUTHENTICATION_2 descriptor. // Sanity check for EFI_VARIABLE_AUTHENTICATION_2 descriptor.
// //
if (DataSize < OFFSET_OF_AUTHINFO2_CERT_DATA || if (DataSize < OFFSET_OF_AUTHINFO2_CERT_DATA ||
DataSize < AUTHINFO2_SIZE (Data) || ((EFI_VARIABLE_AUTHENTICATION_2 *) Data)->AuthInfo.Hdr.dwLength > DataSize - (OFFSET_OF (EFI_VARIABLE_AUTHENTICATION_2, AuthInfo)) ||
((EFI_VARIABLE_AUTHENTICATION_2 *) Data)->AuthInfo.Hdr.dwLength < OFFSET_OF (WIN_CERTIFICATE_UEFI_GUID, CertData)) { ((EFI_VARIABLE_AUTHENTICATION_2 *) Data)->AuthInfo.Hdr.dwLength < OFFSET_OF (WIN_CERTIFICATE_UEFI_GUID, CertData)) {
return EFI_SECURITY_VIOLATION; return EFI_SECURITY_VIOLATION;
} }
PayloadSize = DataSize - AUTHINFO2_SIZE (Data); PayloadSize = DataSize - AUTHINFO2_SIZE (Data);