Ventoy Secure Boot Policy Update

- Add Ventoy Preload module.

EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.c

@@ -7,12 +7,12 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
@@ -41,7 +41,7 @@ STATIC CONST CHAR16 *gCurFeature= NULL;
 STATIC CHAR16 *gCmdLine = NULL;
 STATIC grub_env_printf_pf g_env_printf = NULL;
 
-STATIC VtoyUtilFeature gFeatureList[] = 
+STATIC VtoyUtilFeature gFeatureList[] =
 {
     { L"fix_windows_mmap", FixWindowsMemhole },
     { L"show_efi_drivers", ShowEfiDrivers    },
@@ -93,7 +93,7 @@ VOID EFIAPI VtoyUtilDebug(IN CONST CHAR8  *Format, ...)
 }
 
 STATIC EFI_STATUS ParseCmdline(IN EFI_HANDLE ImageHandle)
-{   
+{
     CHAR16 *pPos = NULL;
     CHAR16 *pCmdLine = NULL;
     EFI_STATUS Status = EFI_SUCCESS;
@@ -117,7 +117,7 @@ STATIC EFI_STATUS ParseCmdline(IN EFI_HANDLE ImageHandle)
         gST->ConOut->OutputString(gST->ConOut, L"\r\n##########################");
         return EFI_SUCCESS;
     }
-    
+
     if (StrStr(pCmdLine, L"debug"))
     {
         gVtoyDebugPrint = TRUE;
@@ -139,12 +139,38 @@ STATIC EFI_STATUS ParseCmdline(IN EFI_HANDLE ImageHandle)
     }
 
     gCurFeature = pPos + StrLen(L"feature=");
-    
+
     gCmdLine = pCmdLine;
-    
+
     return EFI_SUCCESS;
 }
 
+#if defined (MDE_CPU_X64)
+STATIC BOOLEAN EFIAPI CheckVtoyShim(VOID)
+{
+    UINT8 SecureBoot = 0;
+	UINTN DataSize;
+	EFI_STATUS Status;
+    EFI_GUID Guid = VTOY_SHIM_POLICY_GUID;
+    VOID *Prot = NULL;
+
+	DataSize = sizeof(SecureBoot);
+	Status = gST->RuntimeServices->GetVariable(L"SecureBoot", &gEfiGlobalVariableGuid, NULL,
+				     &DataSize, &SecureBoot);
+	if (!EFI_ERROR(Status) && SecureBoot)
+    {
+        Status = gBS->LocateProtocol(&Guid, NULL, (VOID**)&Prot);
+        if (EFI_ERROR(Status))
+        {
+            gST->ConOut->OutputString(gST->ConOut, L"Can not locate Vtoy Shim\r\n");
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+#endif
+
 EFI_STATUS EFIAPI VtoyUtilEfiMain
 (
     IN EFI_HANDLE         ImageHandle,
@@ -153,7 +179,16 @@ EFI_STATUS EFIAPI VtoyUtilEfiMain
 {
     UINTN i;
     UINTN Len;
-    
+
+#if defined (MDE_CPU_X64)
+    /* check that Ventoy Shim must exist */
+    if (!CheckVtoyShim())
+    {
+        gBS->Stall(5 * 1000000);
+        return EFI_NOT_FOUND;
+    }
+#endif
+
     ParseCmdline(ImageHandle);
 
     for (i = 0; gCurFeature && i < ARRAY_SIZE(gFeatureList); i++)
@@ -170,7 +205,7 @@ EFI_STATUS EFIAPI VtoyUtilEfiMain
     if (gCmdLine)
     {
         FreePool(gCmdLine);
-        gCmdLine = NULL;        
+        gCmdLine = NULL;
     }
 
     return EFI_SUCCESS;

EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.h

@@ -7,20 +7,22 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
- 
+
 #ifndef __VTOYUTIL_H__
 #define __VTOYUTIL_H__
 
+#define VTOY_SHIM_POLICY_GUID    {0x90a29d14, 0x3968, 0x48fe, { 0x85, 0x81, 0x6b, 0x7f, 0x7d, 0xc4, 0x70, 0x55 }};
+
 #pragma pack(1)
 
 typedef EFI_STATUS (*VTOY_UTIL_PROC_PF)(IN EFI_HANDLE ImageHandle, IN CONST CHAR16 *CmdLine);
@@ -44,14 +46,14 @@ typedef struct ventoy_grub_param
     grub_env_set_pf grub_env_set;
     ventoy_grub_param_file_replace file_replace;
     ventoy_grub_param_file_replace img_replace[VTOY_MAX_CONF_REPLACE];
-    grub_env_printf_pf grub_env_printf;    
+    grub_env_printf_pf grub_env_printf;
 }ventoy_grub_param;
 #pragma pack()
 
 
 typedef struct VtoyUtilFeature
 {
-    CONST CHAR16 *Cmd;    
+    CONST CHAR16 *Cmd;
     VTOY_UTIL_PROC_PF MainProc;
 }VtoyUtilFeature;
 

EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.inf

@@ -23,7 +23,10 @@
   MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   ENTRY_POINT                    = VtoyUtilEfiMain
-
+ 
+[BuildOptions]
+  # Force standard GNU ld to pack and align ELF segments to 4KB page boundaries
+  GCC:*_*_*_DLINK_FLAGS = -Wl,-z,common-page-size=0x1000 -Wl,-z,max-page-size=0x1000
 
 [Sources]
   VtoyUtil.h