Refine soma code to make code run safely.

[mirror_edk2.git] / MdeModulePkg / Universal / DevicePathDxe / DevicePathFromText.c

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
index ebacd12f2b925f468053fd0c10ddb3e4a1d4d15c..162b0e9ef4f89ada7d9888c3cfc9610cd190cf4a 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
@@ -708,7 +708,7 @@ DevPathFromTextPci (
   Pci         = (PCI_DEVICE_PATH *) CreateDeviceNode (\r
                                       HARDWARE_DEVICE_PATH,\r
                                       HW_PCI_DP,\r
-                                      sizeof (PCI_DEVICE_PATH)\r
+                                      (UINT16) sizeof (PCI_DEVICE_PATH)\r
                                       );\r
 \r
   Pci->Function = (UINT8) Strtoi (FunctionStr);\r
@@ -737,7 +737,7 @@ DevPathFromTextPcCard (
   Pccard            = (PCCARD_DEVICE_PATH *) CreateDeviceNode (\r
                                                HARDWARE_DEVICE_PATH,\r
                                                HW_PCCARD_DP,\r
-                                               sizeof (PCCARD_DEVICE_PATH)\r
+                                               (UINT16) sizeof (PCCARD_DEVICE_PATH)\r
                                                );\r
 \r
   Pccard->FunctionNumber  = (UINT8) Strtoi (FunctionNumberStr);\r
@@ -769,7 +769,7 @@ DevPathFromTextMemoryMapped (
   MemMap             = (MEMMAP_DEVICE_PATH *) CreateDeviceNode (\r
                                                HARDWARE_DEVICE_PATH,\r
                                                HW_MEMMAP_DP,\r
-                                               sizeof (MEMMAP_DEVICE_PATH)\r
+                                               (UINT16) sizeof (MEMMAP_DEVICE_PATH)\r
                                                );\r
 \r
   MemMap->MemoryType = (UINT32) Strtoi (MemoryTypeStr);\r
@@ -863,7 +863,7 @@ DevPathFromTextCtrl (
   Controller    = (CONTROLLER_DEVICE_PATH *) CreateDeviceNode (\r
                                                HARDWARE_DEVICE_PATH,\r
                                                HW_CONTROLLER_DP,\r
-                                               sizeof (CONTROLLER_DEVICE_PATH)\r
+                                               (UINT16) sizeof (CONTROLLER_DEVICE_PATH)\r
                                                );\r
   Controller->ControllerNumber = (UINT32) Strtoi (ControllerStr);\r
 \r
@@ -914,7 +914,7 @@ DevPathFromTextAcpi (
   Acpi   = (ACPI_HID_DEVICE_PATH *) CreateDeviceNode (\r
                                       ACPI_DEVICE_PATH,\r
                                       ACPI_DP,\r
-                                      sizeof (ACPI_HID_DEVICE_PATH)\r
+                                      (UINT16) sizeof (ACPI_HID_DEVICE_PATH)\r
                                       );\r
 \r
   EisaIdFromText (HIDStr, &Acpi->HID);\r
@@ -945,7 +945,7 @@ ConvertFromTextAcpi (
   Acpi   = (ACPI_HID_DEVICE_PATH *) CreateDeviceNode (\r
                                       ACPI_DEVICE_PATH,\r
                                       ACPI_DP,\r
-                                      sizeof (ACPI_HID_DEVICE_PATH)\r
+                                      (UINT16) sizeof (ACPI_HID_DEVICE_PATH)\r
                                       );\r
 \r
   Acpi->HID = EFI_PNP_ID (PnPId);\r
@@ -1158,7 +1158,7 @@ DevPathFromTextAta (
   Atapi = (ATAPI_DEVICE_PATH *) CreateDeviceNode (\r
                                   MESSAGING_DEVICE_PATH,\r
                                   MSG_ATAPI_DP,\r
-                                  sizeof (ATAPI_DEVICE_PATH)\r
+                                  (UINT16) sizeof (ATAPI_DEVICE_PATH)\r
                                   );\r
 \r
   PrimarySecondaryStr     = GetNextParamStr (&TextDeviceNode);\r
@@ -1194,7 +1194,7 @@ DevPathFromTextScsi (
   Scsi   = (SCSI_DEVICE_PATH *) CreateDeviceNode (\r
                                    MESSAGING_DEVICE_PATH,\r
                                    MSG_SCSI_DP,\r
-                                   sizeof (SCSI_DEVICE_PATH)\r
+                                   (UINT16) sizeof (SCSI_DEVICE_PATH)\r
                                    );\r
 \r
   Scsi->Pun = (UINT16) Strtoi (PunStr);\r
@@ -1225,7 +1225,7 @@ DevPathFromTextFibre (
   Fibre  = (FIBRECHANNEL_DEVICE_PATH *) CreateDeviceNode (\r
                                           MESSAGING_DEVICE_PATH,\r
                                           MSG_FIBRECHANNEL_DP,\r
-                                          sizeof (FIBRECHANNEL_DEVICE_PATH)\r
+                                          (UINT16) sizeof (FIBRECHANNEL_DEVICE_PATH)\r
                                           );\r
 \r
   Fibre->Reserved = 0;\r
@@ -1255,7 +1255,7 @@ DevPathFromText1394 (
   F1394DevPath  = (F1394_DEVICE_PATH *) CreateDeviceNode (\r
                                           MESSAGING_DEVICE_PATH,\r
                                           MSG_1394_DP,\r
-                                          sizeof (F1394_DEVICE_PATH)\r
+                                          (UINT16) sizeof (F1394_DEVICE_PATH)\r
                                           );\r
 \r
   F1394DevPath->Reserved = 0;\r
@@ -1286,7 +1286,7 @@ DevPathFromTextUsb (
   Usb                   = (USB_DEVICE_PATH *) CreateDeviceNode (\r
                                                 MESSAGING_DEVICE_PATH,\r
                                                 MSG_USB_DP,\r
-                                                sizeof (USB_DEVICE_PATH)\r
+                                                (UINT16) sizeof (USB_DEVICE_PATH)\r
                                                 );\r
 \r
   Usb->ParentPortNumber = (UINT8) Strtoi (PortStr);\r
@@ -1315,7 +1315,7 @@ DevPathFromTextI2O (
   I2ODevPath = (I2O_DEVICE_PATH *) CreateDeviceNode (\r
                                     MESSAGING_DEVICE_PATH,\r
                                     MSG_I2O_DP,\r
-                                    sizeof (I2O_DEVICE_PATH)\r
+                                    (UINT16) sizeof (I2O_DEVICE_PATH)\r
                                     );\r
 \r
   I2ODevPath->Tid  = (UINT32) Strtoi (TIDStr);\r
@@ -1352,7 +1352,7 @@ DevPathFromTextInfiniband (
   InfiniBand = (INFINIBAND_DEVICE_PATH *) CreateDeviceNode (\r
                                             MESSAGING_DEVICE_PATH,\r
                                             MSG_INFINIBAND_DP,\r
-                                            sizeof (INFINIBAND_DEVICE_PATH)\r
+                                            (UINT16) sizeof (INFINIBAND_DEVICE_PATH)\r
                                             );\r
 \r
   InfiniBand->ResourceFlags = (UINT32) Strtoi (FlagsStr);\r
@@ -1403,7 +1403,7 @@ DevPathFromTextVenPcAnsi (
   Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
                                     MESSAGING_DEVICE_PATH,\r
                                     MSG_VENDOR_DP,\r
-                                    sizeof (VENDOR_DEVICE_PATH));\r
+                                    (UINT16) sizeof (VENDOR_DEVICE_PATH));\r
   CopyGuid (&Vendor->Guid, &gEfiPcAnsiGuid);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
@@ -1427,7 +1427,7 @@ DevPathFromTextVenVt100 (
   Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
                                     MESSAGING_DEVICE_PATH,\r
                                     MSG_VENDOR_DP,\r
-                                    sizeof (VENDOR_DEVICE_PATH));\r
+                                    (UINT16) sizeof (VENDOR_DEVICE_PATH));\r
   CopyGuid (&Vendor->Guid, &gEfiVT100Guid);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
@@ -1451,7 +1451,7 @@ DevPathFromTextVenVt100Plus (
   Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
                                     MESSAGING_DEVICE_PATH,\r
                                     MSG_VENDOR_DP,\r
-                                    sizeof (VENDOR_DEVICE_PATH));\r
+                                    (UINT16) sizeof (VENDOR_DEVICE_PATH));\r
   CopyGuid (&Vendor->Guid, &gEfiVT100PlusGuid);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
@@ -1475,7 +1475,7 @@ DevPathFromTextVenUtf8 (
   Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
                                     MESSAGING_DEVICE_PATH,\r
                                     MSG_VENDOR_DP,\r
-                                    sizeof (VENDOR_DEVICE_PATH));\r
+                                    (UINT16) sizeof (VENDOR_DEVICE_PATH));\r
   CopyGuid (&Vendor->Guid, &gEfiVTUTF8Guid);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
@@ -1501,7 +1501,7 @@ DevPathFromTextUartFlowCtrl (
   UartFlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *) CreateDeviceNode (\r
                                                         MESSAGING_DEVICE_PATH,\r
                                                         MSG_VENDOR_DP,\r
-                                                        sizeof (UART_FLOW_CONTROL_DEVICE_PATH)\r
+                                                        (UINT16) sizeof (UART_FLOW_CONTROL_DEVICE_PATH)\r
                                                         );\r
 \r
   CopyGuid (&UartFlowControl->Guid, &gEfiUartDevicePathGuid);\r
@@ -1552,7 +1552,7 @@ DevPathFromTextSAS (
   Sas         = (SAS_DEVICE_PATH *) CreateDeviceNode (\r
                                        MESSAGING_DEVICE_PATH,\r
                                        MSG_VENDOR_DP,\r
-                                       sizeof (SAS_DEVICE_PATH)\r
+                                       (UINT16) sizeof (SAS_DEVICE_PATH)\r
                                        );\r
 \r
   CopyGuid (&Sas->Guid, &gEfiSasDevicePathGuid);\r
@@ -1604,7 +1604,7 @@ DevPathFromTextDebugPort (
   Vend = (VENDOR_DEFINED_MESSAGING_DEVICE_PATH *) CreateDeviceNode (\r
                                                     MESSAGING_DEVICE_PATH,\r
                                                     MSG_VENDOR_DP,\r
-                                                    sizeof (VENDOR_DEFINED_MESSAGING_DEVICE_PATH)\r
+                                                    (UINT16) sizeof (VENDOR_DEFINED_MESSAGING_DEVICE_PATH)\r
                                                     );\r
 \r
   CopyGuid (&Vend->Guid, &gEfiDebugPortProtocolGuid);\r
@@ -1635,7 +1635,7 @@ DevPathFromTextMAC (
   MACDevPath    = (MAC_ADDR_DEVICE_PATH *) CreateDeviceNode (\r
                                               MESSAGING_DEVICE_PATH,\r
                                               MSG_MAC_ADDR_DP,\r
-                                              sizeof (MAC_ADDR_DEVICE_PATH)\r
+                                              (UINT16) sizeof (MAC_ADDR_DEVICE_PATH)\r
                                               );\r
 \r
   MACDevPath->IfType   = (UINT8) Strtoi (IfTypeStr);\r
@@ -1698,7 +1698,7 @@ DevPathFromTextIPv4 (
   IPv4                  = (IPv4_DEVICE_PATH *) CreateDeviceNode (\r
                                                  MESSAGING_DEVICE_PATH,\r
                                                  MSG_IPv4_DP,\r
-                                                 sizeof (IPv4_DEVICE_PATH)\r
+                                                 (UINT16) sizeof (IPv4_DEVICE_PATH)\r
                                                  );\r
 \r
   StrToIPv4Addr (&RemoteIPStr, &IPv4->RemoteIpAddress);\r
@@ -1743,7 +1743,7 @@ DevPathFromTextIPv6 (
   IPv6                  = (IPv6_DEVICE_PATH *) CreateDeviceNode (\r
                                                  MESSAGING_DEVICE_PATH,\r
                                                  MSG_IPv6_DP,\r
-                                                 sizeof (IPv6_DEVICE_PATH)\r
+                                                 (UINT16) sizeof (IPv6_DEVICE_PATH)\r
                                                  );\r
 \r
   StrToIPv6Addr (&RemoteIPStr, &IPv6->RemoteIpAddress);\r
@@ -1788,7 +1788,7 @@ DevPathFromTextUart (
   Uart            = (UART_DEVICE_PATH *) CreateDeviceNode (\r
                                            MESSAGING_DEVICE_PATH,\r
                                            MSG_UART_DP,\r
-                                           sizeof (UART_DEVICE_PATH)\r
+                                           (UINT16) sizeof (UART_DEVICE_PATH)\r
                                            );\r
 \r
   Uart->BaudRate  = (StrCmp (BaudStr, L"DEFAULT") == 0) ? 115200 : Dtoi (BaudStr);\r
@@ -1861,7 +1861,7 @@ ConvertFromTextUsbClass (
   UsbClass    = (USB_CLASS_DEVICE_PATH *) CreateDeviceNode (\r
                                             MESSAGING_DEVICE_PATH,\r
                                             MSG_USB_CLASS_DP,\r
-                                            sizeof (USB_CLASS_DEVICE_PATH)\r
+                                            (UINT16) sizeof (USB_CLASS_DEVICE_PATH)\r
                                             );\r
 \r
   VIDStr      = GetNextParamStr (&TextDeviceNode);\r
@@ -2395,7 +2395,7 @@ DevPathFromTextVlan (
   Vlan    = (VLAN_DEVICE_PATH *) CreateDeviceNode (\r
                                    MESSAGING_DEVICE_PATH,\r
                                    MSG_VLAN_DP,\r
-                                   sizeof (VLAN_DEVICE_PATH)\r
+                                   (UINT16) sizeof (VLAN_DEVICE_PATH)\r
                                    );\r
 \r
   Vlan->VlanId = (UINT16) Strtoi (VlanStr);\r
@@ -2433,7 +2433,7 @@ DevPathFromTextHD (
   Hd                  = (HARDDRIVE_DEVICE_PATH *) CreateDeviceNode (\r
                                                     MEDIA_DEVICE_PATH,\r
                                                     MEDIA_HARDDRIVE_DP,\r
-                                                    sizeof (HARDDRIVE_DEVICE_PATH)\r
+                                                    (UINT16) sizeof (HARDDRIVE_DEVICE_PATH)\r
                                                     );\r
 \r
   Hd->PartitionNumber = (UINT32) Dtoi (PartitionStr);\r
@@ -2487,7 +2487,7 @@ DevPathFromTextCDROM (
   CDROMDevPath          = (CDROM_DEVICE_PATH *) CreateDeviceNode (\r
                                                   MEDIA_DEVICE_PATH,\r
                                                   MEDIA_CDROM_DP,\r
-                                                  sizeof (CDROM_DEVICE_PATH)\r
+                                                  (UINT16) sizeof (CDROM_DEVICE_PATH)\r
                                                   );\r
 \r
   CDROMDevPath->BootEntry = (UINT32) Strtoi (EntryStr);\r
@@ -2563,7 +2563,7 @@ DevPathFromTextMedia (
   Media   = (MEDIA_PROTOCOL_DEVICE_PATH *) CreateDeviceNode (\r
                                              MEDIA_DEVICE_PATH,\r
                                              MEDIA_PROTOCOL_DP,\r
-                                             sizeof (MEDIA_PROTOCOL_DEVICE_PATH)\r
+                                             (UINT16) sizeof (MEDIA_PROTOCOL_DEVICE_PATH)\r
                                              );\r
 \r
   StrToGuid (GuidStr, &Media->Protocol);\r
@@ -2591,7 +2591,7 @@ DevPathFromTextFv (
   Fv      = (MEDIA_FW_VOL_DEVICE_PATH *) CreateDeviceNode (\r
                                            MEDIA_DEVICE_PATH,\r
                                            MEDIA_PIWG_FW_VOL_DP,\r
-                                           sizeof (MEDIA_FW_VOL_DEVICE_PATH)\r
+                                           (UINT16) sizeof (MEDIA_FW_VOL_DEVICE_PATH)\r
                                            );\r
 \r
   StrToGuid (GuidStr, &Fv->FvName);\r
@@ -2619,7 +2619,7 @@ DevPathFromTextFvFile (
   FvFile  = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) CreateDeviceNode (\r
                                                     MEDIA_DEVICE_PATH,\r
                                                     MEDIA_PIWG_FW_FILE_DP,\r
-                                                    sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)\r
+                                                    (UINT16) sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)\r
                                                     );\r
 \r
   StrToGuid (GuidStr, &FvFile->FvFileName);\r
@@ -2649,7 +2649,7 @@ DevPathFromTextRelativeOffsetRange (
   Offset            = (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *) CreateDeviceNode (\r
                                                                     MEDIA_DEVICE_PATH,\r
                                                                     MEDIA_RELATIVE_OFFSET_RANGE_DP,\r
-                                                                    sizeof (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH)\r
+                                                                    (UINT16) sizeof (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH)\r
                                                                     );\r
 \r
   Strtoi64 (StartingOffsetStr, &Offset->StartingOffset);\r
@@ -2741,7 +2741,7 @@ DevPathFromTextSata (
   Sata = (SATA_DEVICE_PATH *) CreateDeviceNode (\r
                                 MESSAGING_DEVICE_PATH,\r
                                 MSG_SATA_DP,\r
-                                sizeof (SATA_DEVICE_PATH)\r
+                                (UINT16) sizeof (SATA_DEVICE_PATH)\r
                                 );\r
   Sata->HBAPortNumber = (UINT16) Xtoi (Param1);\r
   if (Param3 != NULL) {\r