According to PI 1.2 spec Vol 3 chapter 8 PCD, if the PCD service determined that the size of the data being set was

incompatible with a call to this function, PCD_PPI/PROTOCOL's SetXEx interfaces should be return EFI_INVALID_PARAEMTER instead of ASSERT().

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9753 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 12 insertions, 8 deletions

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index 532bb39cc4..1999ac6cc4 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -1,7 +1,7 @@
 /** @file

     Help functions used by PCD DXE driver.

 

-Copyright (c) 2006 - 2007, Intel Corporation

+Copyright (c) 2006 - 2010, Intel Corporation

 All rights reserved. This program and the accompanying materials

 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

@@ -678,6 +678,7 @@ SetValueWorker (
 

   @retval EFI_INVALID_PARAMETER  If this PCD type is VPD, VPD PCD can not be set.

   @retval EFI_INVALID_PARAMETER  If Size can not be set to size table.

+  @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.  

   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in

                                  range of UINT8, UINT16, UINT32, UINT64

   @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.                                

@@ -727,8 +728,8 @@ SetWorker (
   //

   ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);

 

-  if (!PtrType) {

-    ASSERT (*Size == DxePcdGetSize (TokenNumber + 1));

+  if ((!PtrType) && (*Size != DxePcdGetSize (TokenNumber + 1))) {

+    return EFI_INVALID_PARAMETER;

   }

   

   //

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 583b0d657d..5602a72868 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -1,7 +1,7 @@
 /** @file

 Private functions used by PCD DXE driver.

 

-Copyright (c) 2006 - 2007, Intel Corporation

+Copyright (c) 2006 - 2010, Intel Corporation

 All rights reserved. This program and the accompanying materials

 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

@@ -775,6 +775,7 @@ SetValueWorker (
 

   @retval EFI_INVALID_PARAMETER  If this PCD type is VPD, VPD PCD can not be set.

   @retval EFI_INVALID_PARAMETER  If Size can not be set to size table.

+  @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.  

   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in

                                  range of UINT8, UINT16, UINT32, UINT64

   @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.                                

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index a791ef725a..135d3dd397 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -2,7 +2,7 @@
   The driver internal functions are implmented here.

   They build Pei PCD database, and provide access service to PCD database.

 

-Copyright (c) 2006 - 2009, Intel Corporation

+Copyright (c) 2006 - 2010, Intel Corporation

 All rights reserved. This program and the accompanying materials

 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

@@ -344,6 +344,7 @@ SetValueWorker (
 

   @retval EFI_INVALID_PARAMETER  If this PCD type is VPD, VPD PCD can not be set.

   @retval EFI_INVALID_PARAMETER  If Size can not be set to size table.

+  @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.

   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in

                                  range of UINT8, UINT16, UINT32, UINT64

   @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.                                

@@ -383,8 +384,8 @@ SetWorker (
 

   LocalTokenNumber = PeiPcdDb->Init.LocalTokenNumberTable[TokenNumber];

 

-  if (!PtrType) {

-    ASSERT (PeiPcdGetSize(TokenNumber + 1) == *Size);

+  if ((!PtrType) && (PeiPcdGetSize(TokenNumber + 1) != *Size)) {

+    return EFI_INVALID_PARAMETER;

   }

 

   //

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index b5c2a872a8..c4a08f127d 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -1,7 +1,7 @@
 /** @file

   The internal header file declares the private functions used by PeiPcd driver.

 

-Copyright (c) 2006 - 2009, Intel Corporation

+Copyright (c) 2006 - 2010, Intel Corporation

 All rights reserved. This program and the accompanying materials

 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

@@ -794,6 +794,7 @@ SetValueWorker (
 

   @retval EFI_INVALID_PARAMETER  If this PCD type is VPD, VPD PCD can not be set.

   @retval EFI_INVALID_PARAMETER  If Size can not be set to size table.

+  @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.

   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in

                                  range of UINT8, UINT16, UINT32, UINT64

   @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.