Fix a bug that the invalid public key will never be removed from public key database.

[mirror_edk2.git] / SecurityPkg / VariableAuthenticated / RuntimeDxe / AuthService.c

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
index 09c58db985928a44c5351a70c9b5fd9e4b243847..1ba934b92294afe44fd9551803e12e5cf11121a7 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
@@ -15,7 +15,7 @@
   They will do basic validation for authentication data structure, then call crypto library\r
   to verify the signature.\r
 \r
-Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -34,6 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 UINT8    mPubKeyStore[MAX_KEYDB_SIZE];\r
 UINT32   mPubKeyNumber;\r
+UINT8    mCertDbStore[MAX_CERTDB_SIZE];\r
 UINT32   mPlatformMode;\r
 EFI_GUID mSignatureSupport[] = {EFI_CERT_SHA1_GUID, EFI_CERT_SHA256_GUID, EFI_CERT_RSA2048_GUID, EFI_CERT_X509_GUID};\r
 //\r
@@ -398,7 +399,7 @@ AutenticatedVariableServiceInitialize (
 \r
   if (Variable.CurrPtr == NULL) {\r
     VarAttr  = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS;\r
-    ListSize = 0;\r
+    ListSize = sizeof (UINT32);\r
     Status   = UpdateVariable (\r
                  EFI_CERT_DB_NAME,\r
                  &gEfiCertDbGuid,\r
@@ -410,7 +411,9 @@ AutenticatedVariableServiceInitialize (
                  &Variable,\r
                  NULL\r
                  );\r
-\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
   }  \r
 \r
   return Status;\r
@@ -434,6 +437,8 @@ AddPubKeyInStore (
   UINT32                  Index;\r
   VARIABLE_POINTER_TRACK  Variable;\r
   UINT8                   *Ptr;\r
+  UINT8                   *Data;\r
+  UINTN                   DataSize;\r
 \r
   if (PubKey == NULL) {\r
     return 0;\r
@@ -465,9 +470,45 @@ AddPubKeyInStore (
     //\r
     if (mPubKeyNumber == MAX_KEY_NUM) {\r
       //\r
-      // Notes: Database is full, need enhancement here, currently just return 0.\r
+      // Public key dadatase is full, try to reclaim invalid key.\r
       //\r
-      return 0;\r
+      if (AtRuntime ()) {\r
+        //\r
+        // NV storage can't reclaim at runtime.\r
+        //\r
+        return 0;\r
+      }\r
+      \r
+      Status = Reclaim (\r
+                 mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase,\r
+                 &mVariableModuleGlobal->NonVolatileLastVariableOffset,\r
+                 FALSE,\r
+                 NULL,\r
+                 TRUE,\r
+                 TRUE\r
+                 );\r
+      if (EFI_ERROR (Status)) {\r
+        return 0;\r
+      }\r
+\r
+      Status = FindVariable (\r
+                 AUTHVAR_KEYDB_NAME,\r
+                 &gEfiAuthenticatedVariableGuid,\r
+                 &Variable,\r
+                 &mVariableModuleGlobal->VariableGlobal,\r
+                 FALSE\r
+                 );\r
+      ASSERT_EFI_ERROR (Status);\r
+\r
+      DataSize  = DataSizeOfVariable (Variable.CurrPtr);\r
+      Data      = GetVariableDataPtr (Variable.CurrPtr);\r
+      ASSERT ((DataSize != 0) && (Data != NULL));\r
+      CopyMem (mPubKeyStore, (UINT8 *) Data, DataSize);\r
+      mPubKeyNumber = (UINT32) (DataSize / EFI_CERT_TYPE_RSA2048_SIZE);\r
+\r
+      if (mPubKeyNumber == MAX_KEY_NUM) {\r
+        return 0;\r
+      }     \r
     }\r
 \r
     CopyMem (mPubKeyStore + mPubKeyNumber * EFI_CERT_TYPE_RSA2048_SIZE, PubKey, EFI_CERT_TYPE_RSA2048_SIZE);\r
@@ -523,7 +564,9 @@ VerifyCounterBasedPayload (
   EFI_CERT_BLOCK_RSA_2048_SHA256  *CertBlock;\r
   UINT8                           Digest[SHA256_DIGEST_SIZE];\r
   VOID                            *Rsa;\r
-\r
+  UINTN                           PayloadSize;\r
+  \r
+  PayloadSize = DataSize - AUTHINFO_SIZE;\r
   Rsa         = NULL;\r
   CertData    = NULL;\r
   CertBlock   = NULL;\r
@@ -555,7 +598,14 @@ VerifyCounterBasedPayload (
   if (!Status) {\r
     goto Done;\r
   }\r
-  Status  = Sha256Update (mHashCtx, Data + AUTHINFO_SIZE, (UINTN) (DataSize - AUTHINFO_SIZE));\r
+  Status  = Sha256Update (mHashCtx, Data + AUTHINFO_SIZE, PayloadSize);\r
+  if (!Status) {\r
+    goto Done;\r
+  }\r
+  //\r
+  // Hash Size.\r
+  //\r
+  Status  = Sha256Update (mHashCtx, &PayloadSize, sizeof (UINTN));\r
   if (!Status) {\r
     goto Done;\r
   }\r
@@ -1096,6 +1146,7 @@ ProcessVarWithKek (
   @return EFI_INVALID_PARAMETER           Invalid parameter.\r
   @return EFI_WRITE_PROTECTED             Variable is write-protected and needs authentication with\r
                                           EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS set.\r
+  @return EFI_OUT_OF_RESOURCES            The Database to save the public key is full.\r
   @return EFI_SECURITY_VIOLATION          The variable is with EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS\r
                                           set, but the AuthInfo does NOT pass the validation\r
                                           check carried out by the firmware.\r
@@ -1134,6 +1185,22 @@ ProcessVariable (
     return EFI_SECURITY_VIOLATION;\r
   }\r
   \r
+  //\r
+  // A time-based authenticated variable and a count-based authenticated variable\r
+  // can't be updated by each other.\r
+  // \r
+  if (Variable->CurrPtr != NULL) {    \r
+    if (((Attributes & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) != 0) &&\r
+        ((Variable->CurrPtr->Attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0)) {\r
+      return EFI_SECURITY_VIOLATION;      \r
+    }\r
+    \r
+    if (((Attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0) && \r
+        ((Variable->CurrPtr->Attributes & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) != 0)) {\r
+      return EFI_SECURITY_VIOLATION;      \r
+    }\r
+  }\r
+    \r
   //\r
   // Process Time-based Authenticated variable.\r
   //\r
@@ -1234,7 +1301,7 @@ ProcessVariable (
     //\r
     KeyIndex = AddPubKeyInStore (PubKey);\r
     if (KeyIndex == 0) {\r
-      return EFI_SECURITY_VIOLATION;\r
+      return EFI_OUT_OF_RESOURCES;\r
     }\r
   }\r
 \r
@@ -1378,7 +1445,7 @@ CompareTimeStamp (
   } else if (FirstTime->Hour != SecondTime->Hour) {\r
     return (BOOLEAN) (FirstTime->Hour < SecondTime->Hour);\r
   } else if (FirstTime->Minute != SecondTime->Minute) {\r
-    return (BOOLEAN) (FirstTime->Minute < FirstTime->Minute);\r
+    return (BOOLEAN) (FirstTime->Minute < SecondTime->Minute);\r
   }\r
 \r
   return (BOOLEAN) (FirstTime->Second <= SecondTime->Second);\r
@@ -1664,10 +1731,7 @@ DeleteCertsFromDb (
   // Construct new data content of variable "certdb".\r
   //\r
   NewCertDbSize = (UINT32) DataSize - CertNodeSize;\r
-  NewCertDb     = AllocateZeroPool (NewCertDbSize);\r
-  if (NewCertDb == NULL) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
+  NewCertDb     = (UINT8*) mCertDbStore;\r
 \r
   //\r
   // Copy the DB entries before deleting node.\r
@@ -1704,7 +1768,6 @@ DeleteCertsFromDb (
                NULL\r
                );\r
 \r
-  FreePool (NewCertDb);\r
   return Status;\r
 }\r
 \r
@@ -1793,11 +1856,11 @@ InsertCertsToDb (
   //\r
   NameSize      = (UINT32) StrLen (VariableName);\r
   CertNodeSize  = sizeof (AUTH_CERT_DB_DATA) + (UINT32) CertDataSize + NameSize * sizeof (CHAR16); \r
-  NewCertDbSize = (UINT32) DataSize + CertNodeSize;                  \r
-  NewCertDb     = AllocateZeroPool (NewCertDbSize);\r
-  if (NewCertDb == NULL) {\r
+  NewCertDbSize = (UINT32) DataSize + CertNodeSize;\r
+  if (NewCertDbSize > MAX_CERTDB_SIZE) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+  NewCertDb     = (UINT8*) mCertDbStore;\r
 \r
   //\r
   // Copy the DB entries before deleting node.\r
@@ -1844,7 +1907,6 @@ InsertCertsToDb (
                NULL\r
                );\r
 \r
-  FreePool (NewCertDb);\r
   return Status;\r
 }\r
 \r
@@ -2141,13 +2203,13 @@ VerifyTimeBasedPayload (
     //\r
     // Delete signer's certificates when delete the common authenticated variable.\r
     //\r
-    if ((PayloadSize == 0) && (Variable->CurrPtr != NULL)) {\r
+    if ((PayloadSize == 0) && (Variable->CurrPtr != NULL) && ((Attributes & EFI_VARIABLE_APPEND_WRITE) == 0)) {\r
       Status = DeleteCertsFromDb (VariableName, VendorGuid);\r
       if (EFI_ERROR (Status)) {\r
         VerifyStatus = FALSE;\r
         goto Exit;\r
       }\r
-    } else if (Variable->CurrPtr == NULL) {\r
+    } else if (Variable->CurrPtr == NULL && PayloadSize != 0) {\r
       //\r
       // Insert signer's certificates when adding a new common authenticated variable.\r
       //\r