commit 0c850b41a3f874ed2b56ae9b41ad106f237faf79
author James Bottomley <James.Bottomley@HansenPartnership.com> Sun Mar 06 12:15:55 2016 -0500
committer James Bottomley <James.Bottomley@HansenPartnership.com> Fri Mar 25 11:10:12 2016 -0400
tree a70a6d4455f49c1696c9e7ee74abbfc36af52a16
parent b50b862abd8542d6673b4cb9a8543b5880227ad6

security_policy: convert to using pkcs7verify protocol

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

include/security_policy.h

diff --git a/include/security_policy.h b/include/security_policy.h
index a1c1002..4068a3a 100644
--- a/include/security_policy.h
+++ b/include/security_policy.h
@@ -1,5 +1,7 @@
+typedef BOOLEAN (*POLICY_FUNCTION)(VOID *data, UINTN len);
+
 EFI_STATUS
-security_policy_install(void);
+security_policy_install(BOOLEAN (*override)(void), POLICY_FUNCTION allow, POLICY_FUNCTION deny);
 EFI_STATUS
 security_policy_uninstall(void);
 void

lib/security_policy.c

diff --git a/lib/security_policy.c b/lib/security_policy.c
index 37a58e4..f63b056 100644
--- a/lib/security_policy.c
+++ b/lib/security_policy.c
@@ -107,6 +107,10 @@
 static EFIAPI EFI_SECURITY_FILE_AUTHENTICATION_STATE esfas = NULL;
 static EFIAPI EFI_SECURITY2_FILE_AUTHENTICATION es2fa = NULL;
 
+static BOOLEAN(*sp_override)(void) = NULL;
+static POLICY_FUNCTION sp_allow = NULL;
+static POLICY_FUNCTION sp_deny = NULL;
+
 EFI_STATUS
 EFIAPI
 security2_policy_authentication (
@@ -156,14 +160,12 @@
 	UINTN FileSize;
 	CHAR16* DevPathStr;
 
+	if (sp_override && sp_override())
+		return EFI_SUCCESS;
+
 	/* Chain original security policy */
 	status = esfas(This, AuthenticationStatus, DevicePathConst);
 
-	/* if OK avoid checking MOK: It's a bit expensive to
-	 * read the whole file in again (esfas already did this) */
-	if (status == EFI_SUCCESS)
-		goto out;
-
 	/* capture failure status: may be either EFI_ACCESS_DENIED or
 	 * EFI_SECURITY_VIOLATION */
 	fail_status = status;
@@ -185,24 +187,38 @@
 	if (status != EFI_SUCCESS)
 		goto out;
 
-	status = security_policy_check_mok(FileBuffer, FileSize);
-	FreePool(FileBuffer);
+	status = EFI_SECURITY_VIOLATION;
+	if (sp_deny && sp_deny(FileBuffer, FileSize))
+		goto out;
 
-	if (status == EFI_ACCESS_DENIED || status == EFI_SECURITY_VIOLATION)
-		/* return what the platform originally said */
-		status = fail_status;
+	status = fail_status;
+	if (status == EFI_SUCCESS)
+		goto out;
+
+	/* fail status is platform security failure now */
+
+	if (sp_allow && sp_allow(FileBuffer, FileSize))
+		status = EFI_SUCCESS;
+
  out:
-	FreePool(OrigDevPath);
+	if (FileBuffer)
+		FreePool(FileBuffer);
+	if (OrigDevPath)
+		FreePool(OrigDevPath);
 	return status;
 }
 
 EFI_STATUS
-security_policy_install(void)
+security_policy_install(BOOLEAN (*override)(void), POLICY_FUNCTION allow, POLICY_FUNCTION deny)
 {
 	EFI_SECURITY_PROTOCOL *security_protocol;
 	EFI_SECURITY2_PROTOCOL *security2_protocol = NULL;
 	EFI_STATUS status;
 
+	sp_override = override;
+	sp_allow = allow;
+	sp_deny = deny;
+
 	if (esfas)
 		/* Already Installed */
 		return EFI_ALREADY_STARTED;