MdeModulePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdeModulePkg / Universal / Disk / PartitionDxe / Gpt.c

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index 2cd3e15e8acbcf49b07615dc4b184df0b64d7495..aefb2d6ecb3f74b12957c511f8d0be6ee2e84c07 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -13,14 +13,9 @@
   PartitionValidGptTable(), PartitionCheckGptEntry() routine will accept disk\r
   partition content and validate the GPT table and GPT entry.\r
 \r
-Copyright (c) 2006 - 2017, 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.\r
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -100,7 +95,7 @@ PartitionRestoreGptTable (
 \r
   @param[in]    PartHeader    Partition table header structure\r
   @param[in]    PartEntry     The partition entry array\r
-  @param[out]   PEntryStatus  the partition entry status array \r
+  @param[out]   PEntryStatus  the partition entry status array\r
                               recording the status of each partition\r
 \r
 **/\r
@@ -235,6 +230,13 @@ PartitionInstallGptChildHandles (
 \r
   GptValidStatus = EFI_NOT_FOUND;\r
 \r
+  //\r
+  // Ensure the block size can hold the MBR\r
+  //\r
+  if (BlockSize < sizeof (MASTER_BOOT_RECORD)) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   //\r
   // Allocate a buffer for the Protective MBR\r
   //\r
@@ -419,7 +421,8 @@ PartitionInstallGptChildHandles (
                &PartitionInfo,\r
                Entry->StartingLBA,\r
                Entry->EndingLBA,\r
-               BlockSize\r
+               BlockSize,\r
+               &Entry->PartitionTypeGUID\r
                );\r
   }\r
 \r
@@ -696,7 +699,7 @@ Done:
 \r
   @param[in]    PartHeader    Partition table header structure\r
   @param[in]    PartEntry     The partition entry array\r
-  @param[out]   PEntryStatus  the partition entry status array \r
+  @param[out]   PEntryStatus  the partition entry status array\r
                               recording the status of each partition\r
 \r
 **/\r
@@ -734,7 +737,7 @@ PartitionCheckGptEntry (
 \r
     if ((Entry->Attributes & BIT1) != 0) {\r
       //\r
-      // If Bit 1 is set, this indicate that this is an OS specific GUID partition. \r
+      // If Bit 1 is set, this indicate that this is an OS specific GUID partition.\r
       //\r
       PEntryStatus[Index1].OsSpecific = TRUE;\r
     }\r