X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FVlanConfigDxe%2FVlanConfigImpl.c;h=0bdffa2ee4373a45cc4d6258e05b76846b6747f5;hb=dff73e4c73fd421421c622a9fd3762588144db96;hp=10fb7fa670b5bb329154af2989ba50cd4a667001;hpb=216f79703b8cb8dc65abdd768bedb2bcdbc1a1f8;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 10fb7fa670..0bdffa2ee4 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -1,7 +1,7 @@
 /** @file
   HII Config Access protocol implementation of VLAN configuration module.
 
-Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
 of the BSD License which accompanies this distribution.  The full
@@ -327,7 +327,7 @@ VlanCallback (
       break;
     }
   }
-  
+
   HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);
   FreePool (Configuration);
   return EFI_SUCCESS;
@@ -412,19 +412,27 @@ VlanUpdateForm (
   for (Index = 0; Index < NumberOfVlan; Index++) {
     String = VlanStr;
 
-    StrCpy (String, L"  VLAN ID:");
+    StrCpyS (String, (sizeof (VlanStr) /sizeof (CHAR16)), L"  VLAN ID:");
     String += 10;
     //
     // Pad VlanId string up to 4 characters with space
     //
-    DigitalCount = UnicodeValueToString (VlanIdStr, 0, VlanData[Index].VlanId, 5);
+    UnicodeValueToStringS (VlanIdStr, sizeof (VlanIdStr), 0, VlanData[Index].VlanId, 5);
+    DigitalCount = StrnLenS (VlanIdStr, ARRAY_SIZE (VlanIdStr));
     SetMem16 (String, (4 - DigitalCount) * sizeof (CHAR16), L' ');
-    StrCpy (String + 4 - DigitalCount, VlanIdStr);
+    StrCpyS (String + 4 - DigitalCount, (sizeof (VlanStr) /sizeof (CHAR16)) - 10 - (4 - DigitalCount), VlanIdStr);
     String += 4;
 
-    StrCpy (String, L", Priority:");
+    StrCpyS (String,  (sizeof (VlanStr) /sizeof (CHAR16)) - 10 - (4 - DigitalCount) - 4, L", Priority:");
     String += 11;
-    String += UnicodeValueToString (String, 0, VlanData[Index].Priority, 4);
+    UnicodeValueToStringS (
+      String,
+      sizeof (VlanStr) - ((UINTN)String - (UINTN)VlanStr),
+      0,
+      VlanData[Index].Priority,
+      4
+      );
+    String += StrnLenS (String, ARRAY_SIZE (VlanStr) - ((UINTN)String - (UINTN)VlanStr) / sizeof (CHAR16));
     *String = 0;
 
     StringId = HiiSetString (PrivateData->HiiHandle, 0, VlanStr, NULL);
@@ -559,9 +567,9 @@ InstallVlanConfigForm (
   }
   PrivateData->MacString = MacString;
 
-  StrCpy (Str, L"VLAN Configuration (MAC:");
-  StrnCat (Str, MacString, sizeof (EFI_MAC_ADDRESS) * 2);
-  StrCat (Str, L")");
+  StrCpyS (Str, sizeof (Str) / sizeof (CHAR16), L"VLAN Configuration (MAC:");
+  StrCatS (Str, sizeof (Str) / sizeof (CHAR16), MacString);
+  StrCatS (Str, sizeof (Str) / sizeof (CHAR16), L")");
   HiiSetString (
     HiiHandle,
     STRING_TOKEN (STR_VLAN_FORM_SET_TITLE_HELP),
@@ -588,50 +596,54 @@ InstallVlanConfigForm (
 
   @param[in, out]  PrivateData   Points to VLAN configuration private data.
 
+  @retval EFI_SUCCESS            HII Form has been uninstalled successfully.
+  @retval Others                 Other errors as indicated.
+
 **/
-VOID
+EFI_STATUS
 UninstallVlanConfigForm (
   IN OUT VLAN_CONFIG_PRIVATE_DATA    *PrivateData
   )
 {
-  //
-  // Free MAC string
-  //
-  if (PrivateData->MacString != NULL) {
-    FreePool (PrivateData->MacString);
-    PrivateData->MacString = NULL;
-  }
-
-  //
-  // Uninstall HII package list
-  //
-  if (PrivateData->HiiHandle != NULL) {
-    HiiRemovePackages (PrivateData->HiiHandle);
-    PrivateData->HiiHandle = NULL;
-  }
+  EFI_STATUS                   Status;
+  EFI_VLAN_CONFIG_PROTOCOL     *VlanConfig;
 
   //
   // End the parent-child relationship.
   //
-  gBS->CloseProtocol (
-         PrivateData->ControllerHandle,
-         &gEfiVlanConfigProtocolGuid,
-         PrivateData->ImageHandle,
-         PrivateData->DriverHandle
-         );
+  Status = gBS->CloseProtocol (
+                  PrivateData->ControllerHandle,
+                  &gEfiVlanConfigProtocolGuid,
+                  PrivateData->ImageHandle,
+                  PrivateData->DriverHandle
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
 
   //
   // Uninstall HII Config Access Protocol
   //
   if (PrivateData->DriverHandle != NULL) {
-    gBS->UninstallMultipleProtocolInterfaces (
-           PrivateData->DriverHandle,
-           &gEfiDevicePathProtocolGuid,
-           PrivateData->ChildDevicePath,
-           &gEfiHiiConfigAccessProtocolGuid,
-           &PrivateData->ConfigAccess,
-           NULL
-           );
+    Status = gBS->UninstallMultipleProtocolInterfaces (
+                    PrivateData->DriverHandle,
+                    &gEfiDevicePathProtocolGuid,
+                    PrivateData->ChildDevicePath,
+                    &gEfiHiiConfigAccessProtocolGuid,
+                    &PrivateData->ConfigAccess,
+                    NULL
+                    );
+    if (EFI_ERROR (Status)) {
+      gBS->OpenProtocol (
+             PrivateData->ControllerHandle,
+             &gEfiVlanConfigProtocolGuid,
+             (VOID **)&VlanConfig,
+             PrivateData->ImageHandle,
+             PrivateData->DriverHandle,
+             EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
+             );
+      return Status;
+    }
     PrivateData->DriverHandle = NULL;
 
     if (PrivateData->ChildDevicePath != NULL) {
@@ -639,4 +651,21 @@ UninstallVlanConfigForm (
       PrivateData->ChildDevicePath = NULL;
     }
   }
+
+  //
+  // Free MAC string
+  //
+  if (PrivateData->MacString != NULL) {
+    FreePool (PrivateData->MacString);
+    PrivateData->MacString = NULL;
+  }
+
+  //
+  // Uninstall HII package list
+  //
+  if (PrivateData->HiiHandle != NULL) {
+    HiiRemovePackages (PrivateData->HiiHandle);
+    PrivateData->HiiHandle = NULL;
+  }
+  return EFI_SUCCESS;
 }