ShellPkg/map: Fix out-of-bound read when "map fsn"

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / Map.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index e7d19c9bed702c84d339c68265010282991aba3c..9166ca2205ca2631a62c81aaf20505233c2ebdbc 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,7 +1,10 @@
 /** @file\r
   Main file for map shell level 2 command.\r
 \r
 /** @file\r
   Main file for map shell level 2 command.\r
 \r

-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+  \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
   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


@@ -31,7 +34,6 @@
   @retval FALSE           String has at least one other character.\r
 **/\r
 BOOLEAN\r
   @retval FALSE           String has at least one other character.\r
 **/\r
 BOOLEAN\r

-EFIAPI\r

 IsNumberLetterOnly(\r
   IN CONST CHAR16 *String,\r
   IN CONST UINTN  Len\r
 IsNumberLetterOnly(\r
   IN CONST CHAR16 *String,\r
   IN CONST UINTN  Len\r


@@ -62,7 +64,6 @@ IsNumberLetterOnly(
                           items (";" normally). \r
 **/\r
 BOOLEAN\r
                           items (";" normally). \r
 **/\r
 BOOLEAN\r

-EFIAPI\r

 SearchList(\r
   IN CONST CHAR16   *List,\r
   IN CONST CHAR16   *MetaTarget,\r
 SearchList(\r
   IN CONST CHAR16   *List,\r
   IN CONST CHAR16   *MetaTarget,\r


@@ -117,108 +118,6 @@ SearchList(
   return (FALSE);\r
 }\r
 \r
   return (FALSE);\r
 }\r
 \r

-/**\r
-  Add mappings for any devices without one.  Do not change any existing maps.\r
-\r
-  @retval EFI_SUCCESS   The operation was successful.\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-UpdateMapping (\r
-  VOID\r
-  )\r
-{\r
-  EFI_STATUS                Status;\r
-  EFI_HANDLE                *HandleList;\r
-  UINTN                     Count;\r
-  EFI_DEVICE_PATH_PROTOCOL  **DevicePathList;\r
-  CHAR16                    *NewDefaultName;\r
-  CHAR16                    *NewConsistName;\r
-  EFI_DEVICE_PATH_PROTOCOL  **ConsistMappingTable;\r
-\r
-  HandleList  = NULL;\r
-  Status      = EFI_SUCCESS;\r
-\r
-  //\r
-  // remove mappings that represent removed devices.\r
-  //\r
-\r
-  //\r
-  // Find each handle with Simple File System\r
-  //\r
-  HandleList = GetHandleListByProtocol(&gEfiSimpleFileSystemProtocolGuid);\r
-  if (HandleList != NULL) {\r
-    //\r
-    // Do a count of the handles\r
-    //\r
-    for (Count = 0 ; HandleList[Count] != NULL ; Count++);\r
-\r
-    //\r
-    // Get all Device Paths\r
-    //\r
-    DevicePathList = AllocateZeroPool(sizeof(EFI_DEVICE_PATH_PROTOCOL*) * Count);\r
-    ASSERT(DevicePathList != NULL);\r
-\r
-    for (Count = 0 ; HandleList[Count] != NULL ; Count++) {\r
-      DevicePathList[Count] = DevicePathFromHandle(HandleList[Count]);\r
-    }\r
-\r
-    //\r
-    // Sort all DevicePaths\r
-    //\r
-    PerformQuickSort(DevicePathList, Count, sizeof(EFI_DEVICE_PATH_PROTOCOL*), DevicePathCompare);\r
-\r
-    ShellCommandConsistMappingInitialize(&ConsistMappingTable);\r
-\r
-    //\r
-    // Assign new Mappings to remainders\r
-    //\r
-    for (Count = 0 ; HandleList[Count] != NULL && !EFI_ERROR(Status); Count++) {\r
-      //\r
-      // Skip ones that already have\r
-      //\r
-      if (gEfiShellProtocol->GetMapFromDevicePath(&DevicePathList[Count]) != NULL) {\r
-        continue;\r
-      }\r
-      //\r
-      // Get default name\r
-      //\r
-      NewDefaultName = ShellCommandCreateNewMappingName(MappingTypeFileSystem);\r
-      ASSERT(NewDefaultName != NULL);\r
-\r
-      //\r
-      // Call shell protocol SetMap function now...\r
-      //\r
-      Status = gEfiShellProtocol->SetMap(DevicePathList[Count], NewDefaultName);\r
-\r
-      if (!EFI_ERROR(Status)) {\r
-        //\r
-        // Now do consistent name\r
-        //\r
-        NewConsistName = ShellCommandConsistMappingGenMappingName(DevicePathList[Count], ConsistMappingTable);\r
-        if (NewConsistName != NULL) {\r
-          Status = gEfiShellProtocol->SetMap(DevicePathList[Count], NewConsistName);\r
-          FreePool(NewConsistName);\r
-        }\r
-      }\r
-\r
-      FreePool(NewDefaultName);\r
-    }\r
-    ShellCommandConsistMappingUnInitialize(ConsistMappingTable);\r
-    SHELL_FREE_NON_NULL(HandleList);\r
-    SHELL_FREE_NON_NULL(DevicePathList);\r
-\r
-    HandleList = NULL;\r
-  } else {\r
-    Count = (UINTN)-1;\r
-  }\r
-  //\r
-  // Do it all over again for gEfiBlockIoProtocolGuid\r
-  //\r
-\r
-  return (Status);\r
-}\r
-\r

 /**\r
   Determine what type of device is represented and return it's string.  The \r
   string is in allocated memory and must be callee freed.  The HII is is listed below.\r
 /**\r
   Determine what type of device is represented and return it's string.  The \r
   string is in allocated memory and must be callee freed.  The HII is is listed below.\r


@@ -232,7 +131,6 @@ UpdateMapping (
   @retval STR_MAP_MEDIA_FLOPPY    The media is a floppy drive.\r
 **/\r
 CHAR16*\r
   @retval STR_MAP_MEDIA_FLOPPY    The media is a floppy drive.\r
 **/\r
 CHAR16*\r

-EFIAPI\r

 GetDeviceMediaType (\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
   )\r
 GetDeviceMediaType (\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
   )\r


@@ -278,7 +176,6 @@ GetDeviceMediaType (
   @retval FALSE                     The handle does not have removable storage.\r
 **/\r
 BOOLEAN\r
   @retval FALSE                     The handle does not have removable storage.\r
 **/\r
 BOOLEAN\r

-EFIAPI\r

 IsRemoveableDevice (\r
   IN EFI_DEVICE_PATH_PROTOCOL      *DevicePath\r
   )\r
 IsRemoveableDevice (\r
   IN EFI_DEVICE_PATH_PROTOCOL      *DevicePath\r
   )\r


@@ -315,7 +212,6 @@ IsRemoveableDevice (
   @retval FALSE               The map should not be displayed.\r
 **/\r
 BOOLEAN\r
   @retval FALSE               The map should not be displayed.\r
 **/\r
 BOOLEAN\r

-EFIAPI\r

 MappingListHasType(\r
   IN CONST CHAR16     *MapList,\r
   IN CONST CHAR16     *Specific,\r
 MappingListHasType(\r
   IN CONST CHAR16     *MapList,\r
   IN CONST CHAR16     *Specific,\r


@@ -324,18 +220,29 @@ MappingListHasType(
   IN CONST BOOLEAN    Consist\r
   )\r
 {\r
   IN CONST BOOLEAN    Consist\r
   )\r
 {\r

-  CHAR16 *NewSpecific;\r
+  CHAR16              *NewSpecific;\r
+  RETURN_STATUS       Status;\r
+  UINTN               Length;\r
+  \r

   //\r
   // specific has priority\r
   //\r
   if (Specific != NULL) {\r
   //\r
   // specific has priority\r
   //\r
   if (Specific != NULL) {\r

-    NewSpecific = AllocateZeroPool(StrSize(Specific) + sizeof(CHAR16));\r
+    Length      = StrLen (Specific);\r
+    //\r
+    // Allocate enough buffer for Specific and potential ":"\r
+    //\r
+    NewSpecific = AllocatePool ((Length + 2) * sizeof(CHAR16));\r

     if (NewSpecific == NULL){\r
       return FALSE;\r
     }\r
     if (NewSpecific == NULL){\r
       return FALSE;\r
     }\r

-    StrCpy(NewSpecific, Specific);\r
-    if (NewSpecific[StrLen(NewSpecific)-1] != L':') {\r
-      StrCat(NewSpecific, L":");\r
+    StrCpyS (NewSpecific, Length + 2, Specific);\r
+    if (Specific[Length - 1] != L':') {\r
+      Status = StrnCatS(NewSpecific, Length + 2, L":", StrLen(L":"));\r
+      if (EFI_ERROR (Status)) {\r
+        FreePool(NewSpecific);\r
+        return FALSE;\r
+      }\r

     }\r
 \r
     if (SearchList(MapList, NewSpecific, NULL, TRUE, FALSE, L";")) {\r
     }\r
 \r
     if (SearchList(MapList, NewSpecific, NULL, TRUE, FALSE, L";")) {\r


@@ -345,14 +252,16 @@ MappingListHasType(
     FreePool(NewSpecific);\r
   }\r
   if (  Consist\r
     FreePool(NewSpecific);\r
   }\r
   if (  Consist\r

+    && Specific == NULL\r

     && (SearchList(MapList, L"HD*",  NULL, TRUE, TRUE, L";")\r
       ||SearchList(MapList, L"CD*",  NULL, TRUE, TRUE, L";")\r
     && (SearchList(MapList, L"HD*",  NULL, TRUE, TRUE, L";")\r
       ||SearchList(MapList, L"CD*",  NULL, TRUE, TRUE, L";")\r

-      ||SearchList(MapList, L"AnyF*",   NULL, TRUE, TRUE, L";")\r
+      ||SearchList(MapList, L"F*",   NULL, TRUE, TRUE, L";")\r

       ||SearchList(MapList, L"FP*",  NULL, TRUE, TRUE, L";"))){\r
     return (TRUE);\r
   }\r
 \r
   if (  Normal\r
       ||SearchList(MapList, L"FP*",  NULL, TRUE, TRUE, L";"))){\r
     return (TRUE);\r
   }\r
 \r
   if (  Normal\r

+    && Specific == NULL\r

     && (SearchList(MapList, L"FS",  NULL, FALSE, TRUE, L";")\r
       ||SearchList(MapList, L"BLK", NULL, FALSE, TRUE, L";"))){\r
     return (TRUE);\r
     && (SearchList(MapList, L"FS",  NULL, FALSE, TRUE, L";")\r
       ||SearchList(MapList, L"BLK", NULL, FALSE, TRUE, L";"))){\r
     return (TRUE);\r


@@ -379,7 +288,6 @@ MappingListHasType(
   @retval EFI_SUCCESS               The mapping was displayed.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS               The mapping was displayed.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 PerformSingleMappingDisplay(\r
   IN CONST BOOLEAN    Verbose,\r
   IN CONST BOOLEAN    Consist,\r
 PerformSingleMappingDisplay(\r
   IN CONST BOOLEAN    Verbose,\r
   IN CONST BOOLEAN    Consist,\r


@@ -397,10 +305,14 @@ PerformSingleMappingDisplay(
   CHAR16                    *MediaType;\r
   CHAR16                    *DevPathString;\r
   CHAR16                    *TempSpot;\r
   CHAR16                    *MediaType;\r
   CHAR16                    *DevPathString;\r
   CHAR16                    *TempSpot;\r

+  CHAR16                    *Alias;\r

   UINTN                     TempLen;\r
   BOOLEAN                   Removable;\r
   CONST CHAR16              *TempSpot2;\r
 \r
   UINTN                     TempLen;\r
   BOOLEAN                   Removable;\r
   CONST CHAR16              *TempSpot2;\r
 \r

+  Alias       = NULL;\r
+  TempSpot2   = NULL;\r
+  CurrentName = NULL;\r

   DevPath = DevicePathFromHandle(Handle);\r
   DevPathCopy = DevPath;\r
   MapList = gEfiShellProtocol->GetMapFromDevicePath(&DevPathCopy);\r
   DevPath = DevicePathFromHandle(Handle);\r
   DevPathCopy = DevPath;\r
   MapList = gEfiShellProtocol->GetMapFromDevicePath(&DevPathCopy);\r


@@ -412,15 +324,83 @@ PerformSingleMappingDisplay(
     return EFI_NOT_FOUND;\r
   }\r
 \r
     return EFI_NOT_FOUND;\r
   }\r
 \r

-  CurrentName = NULL;\r
-  CurrentName = StrnCatGrow(&CurrentName, 0, MapList, 0);\r
-  TempSpot = StrStr(CurrentName, L";");\r
-  if (TempSpot != NULL) {\r
-    *TempSpot = CHAR_NULL;\r
+  if (Normal || !Consist) {\r
+    //\r
+    // need the Normal here since people can use both on command line.  otherwise unused.\r
+    //\r
+\r
+    //\r
+    // Allocate a name\r
+    //\r
+    CurrentName = NULL;\r
+    CurrentName = StrnCatGrow(&CurrentName, 0, MapList, 0);\r
+    if (CurrentName == NULL) {\r
+      return (EFI_OUT_OF_RESOURCES);\r
+    }\r
+\r
+    //\r
+    // Chop off the other names that become "Alias(s)"\r
+    // leaving just the normal name\r
+    //\r
+    TempSpot = StrStr(CurrentName, L";");\r
+    if (TempSpot != NULL) {\r
+      *TempSpot = CHAR_NULL;\r
+    }\r
+  } else {\r
+    CurrentName = NULL;\r
+\r
+    //\r
+    // Skip the first name.  This is the standard name.\r
+    //\r
+    TempSpot = StrStr(MapList, L";");\r
+    if (TempSpot != NULL) {\r
+      TempSpot++;\r
+    }\r
+    SearchList(TempSpot, L"HD*", &CurrentName, TRUE, FALSE, L";");\r
+    if (CurrentName == NULL) {\r
+      SearchList(TempSpot, L"CD*", &CurrentName, TRUE, FALSE, L";");\r
+    }\r
+    if (CurrentName == NULL) {\r
+      SearchList(TempSpot, L"FP*", &CurrentName, TRUE, FALSE, L";");\r
+    }\r
+    if (CurrentName == NULL) {\r
+      SearchList(TempSpot, L"F*",  &CurrentName, TRUE, FALSE, L";");\r
+    }\r
+    if (CurrentName == NULL) {\r
+      //\r
+      // We didnt find anything, so just the first one in the list...\r
+      //\r
+      CurrentName = StrnCatGrow(&CurrentName, 0, MapList, 0);\r
+      if (CurrentName == NULL) {\r
+        return (EFI_OUT_OF_RESOURCES);\r
+      }\r
+      TempSpot = StrStr(CurrentName, L";");\r
+      if (TempSpot != NULL) {\r
+        *TempSpot = CHAR_NULL;\r
+      }\r
+    } else {\r
+      Alias = StrnCatGrow(&Alias, 0, MapList, 0);\r
+      if (Alias == NULL) {\r
+        return EFI_OUT_OF_RESOURCES;\r
+      }\r
+      TempSpot = StrStr(Alias, CurrentName);\r
+      if (TempSpot != NULL) {\r
+        TempSpot2 = StrStr(TempSpot, L";");\r
+        if (TempSpot2 != NULL) {\r
+          TempSpot2++; // Move past ";" from CurrentName\r
+          CopyMem(TempSpot, TempSpot2, StrSize(TempSpot2));\r
+        } else {\r
+          *TempSpot = CHAR_NULL;\r
+        }\r
+      }\r
+      if (Alias[StrLen(Alias)-1] == L';') {\r
+        Alias[StrLen(Alias)-1] = CHAR_NULL;\r
+      }\r
+    }\r

   }\r
   }\r

-  DevPathString = gDevPathToText->ConvertDevicePathToText(DevPath, TRUE, FALSE);\r
+  DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);\r
+  TempLen = StrLen(CurrentName);\r

   if (!SFO) {\r
   if (!SFO) {\r

-    TempLen = StrLen(CurrentName);\r

     ShellPrintHiiEx (\r
       -1,\r
       -1,\r
     ShellPrintHiiEx (\r
       -1,\r
       -1,\r


@@ -428,7 +408,7 @@ PerformSingleMappingDisplay(
       STRING_TOKEN (STR_MAP_ENTRY),\r
       gShellLevel2HiiHandle,\r
       CurrentName,\r
       STRING_TOKEN (STR_MAP_ENTRY),\r
       gShellLevel2HiiHandle,\r
       CurrentName,\r

-      TempLen < StrLen(MapList)?MapList + TempLen+1:L"",\r
+      Alias!=NULL?Alias:(TempLen < StrLen(MapList)?MapList + TempLen+1:L""),\r

       DevPathString\r
      );\r
     if (Verbose) {\r
       DevPathString\r
      );\r
     if (Verbose) {\r


@@ -451,10 +431,9 @@ PerformSingleMappingDisplay(
           TempSpot2\r
          );\r
       }\r
           TempSpot2\r
          );\r
       }\r

-      FreePool(MediaType);\r
+      SHELL_FREE_NON_NULL(MediaType);\r

     }\r
   } else {\r
     }\r
   } else {\r

-    TempLen = StrLen(CurrentName);\r

     ShellPrintHiiEx (\r
       -1,\r
       -1,\r
     ShellPrintHiiEx (\r
       -1,\r
       -1,\r


@@ -463,11 +442,12 @@ PerformSingleMappingDisplay(
       gShellLevel2HiiHandle,\r
       CurrentName,\r
       DevPathString,\r
       gShellLevel2HiiHandle,\r
       CurrentName,\r
       DevPathString,\r

-      TempLen < StrLen(MapList)?MapList + TempLen+1:L""\r
+      Consist?L"":(TempLen < StrLen(MapList)?MapList + TempLen+1:L"")\r

      );\r
   }\r
      );\r
   }\r

-  FreePool(DevPathString);\r
-  FreePool(CurrentName);\r
+  SHELL_FREE_NON_NULL(DevPathString);\r
+  SHELL_FREE_NON_NULL(CurrentName);\r
+  SHELL_FREE_NON_NULL(Alias);\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -481,7 +461,6 @@ PerformSingleMappingDisplay(
   @retval EFI_NOT_FOUND   Name was not a map on Handle.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND   Name was not a map on Handle.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 PerformSingleMappingDelete(\r
   IN CONST CHAR16     *Specific,\r
   IN CONST EFI_HANDLE Handle\r
 PerformSingleMappingDelete(\r
   IN CONST CHAR16     *Specific,\r
   IN CONST EFI_HANDLE Handle\r


@@ -516,22 +495,22 @@ CONST CHAR16 AnyF[] = L"F*";
 /**\r
   Function to display mapping information to the user.\r
 \r
 /**\r
   Function to display mapping information to the user.\r
 \r

-  if Specific is specified then Consist and Normal will be ignored since information will\r
+  If Specific is specified then Consist and Normal will be ignored since information will\r

   be printed for the specific item only.\r
 \r
   be printed for the specific item only.\r
 \r

-  @param[in] Verbose                TRUE to display (extra) verbose information\r
-  @param[in] Consist                TRUE to display consistent mappings\r
-  @param[in] Normal                 TRUE to display normal (not consist) mappings\r
-  @param[in] TypeString             pointer to string of filter types\r
-  @param[in] SFO                    TRUE to display output in Standard Output Format\r
-  @param[in] Specific               pointer to string for specific map to display\r
+  @param[in] Verbose                TRUE to display (extra) verbose information.\r
+  @param[in] Consist                TRUE to display consistent mappings.\r
+  @param[in] Normal                 TRUE to display normal (not consist) mappings.\r
+  @param[in] TypeString             Pointer to string of filter types.\r
+  @param[in] SFO                    TRUE to display output in Standard Output Format.\r
+  @param[in] Specific               Pointer to string for specific map to display.\r
+  @param[in] Header                 TRUE to print the header block.\r

 \r
 \r

-  @retval SHELL_SUCCESS               the display was printed\r
-  @retval SHELL_INVALID_PARAMETER     one of Consist or Normal must be TRUE if no Specific\r
+  @retval SHELL_SUCCESS               The display was printed.\r
+  @retval SHELL_INVALID_PARAMETER     One of Consist or Normal must be TRUE if no Specific.\r

 \r
 **/\r
 SHELL_STATUS\r
 \r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 PerformMappingDisplay(\r
   IN CONST BOOLEAN Verbose,\r
   IN CONST BOOLEAN Consist,\r
 PerformMappingDisplay(\r
   IN CONST BOOLEAN Verbose,\r
   IN CONST BOOLEAN Consist,\r


@@ -550,7 +529,7 @@ PerformMappingDisplay(
   BOOLEAN                   Found;\r
 \r
   if (!Consist && !Normal && Specific == NULL && TypeString == NULL) {\r
   BOOLEAN                   Found;\r
 \r
   if (!Consist && !Normal && Specific == NULL && TypeString == NULL) {\r

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle);\r
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");  \r

     return (SHELL_INVALID_PARAMETER);\r
   }\r
 \r
     return (SHELL_INVALID_PARAMETER);\r
   }\r
 \r


@@ -561,7 +540,7 @@ PerformMappingDisplay(
       if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {\r
         Test = (CHAR16*)Fp;\r
         if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {\r
       if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {\r
         Test = (CHAR16*)Fp;\r
         if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {\r

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, TypeString);\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", TypeString);  \r

           return (SHELL_INVALID_PARAMETER);\r
         }\r
       } else if (Test == NULL) {\r
           return (SHELL_INVALID_PARAMETER);\r
         }\r
       } else if (Test == NULL) {\r


@@ -650,7 +629,7 @@ PerformMappingDisplay(
       &BufferSize,\r
       HandleBuffer);\r
   }\r
       &BufferSize,\r
       HandleBuffer);\r
   }\r

-  if (!EFI_ERROR(Status)) {\r
+  if (!EFI_ERROR(Status) && HandleBuffer != NULL) {\r

     //\r
     // Get the map name(s) for each one.\r
     //\r
     //\r
     // Get the map name(s) for each one.\r
     //\r


@@ -685,7 +664,11 @@ PerformMappingDisplay(
     FreePool(HandleBuffer);\r
   }\r
   if (!Found) {\r
     FreePool(HandleBuffer);\r
   }\r
   if (!Found) {\r

-    ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, Specific);\r
+    if (Specific != NULL) {\r
+      ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", Specific);  \r
+    } else {\r
+      ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle, L"map");  \r
+    }\r

   }\r
   return (SHELL_SUCCESS);\r
 }\r
   }\r
   return (SHELL_SUCCESS);\r
 }\r


@@ -705,7 +688,6 @@ PerformMappingDisplay(
   @sa PerformMappingDisplay\r
 **/\r
 SHELL_STATUS\r
   @sa PerformMappingDisplay\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 PerformMappingDisplay2(\r
   IN CONST BOOLEAN Verbose,\r
   IN CONST BOOLEAN Consist,\r
 PerformMappingDisplay2(\r
   IN CONST BOOLEAN Verbose,\r
   IN CONST BOOLEAN Consist,\r


@@ -758,7 +740,6 @@ PerformMappingDisplay2(
   @retval EFI_NOT_FOUND             Specific could not be found.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND             Specific could not be found.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 PerformMappingDelete(\r
   IN CONST CHAR16  *Specific\r
   )\r
 PerformMappingDelete(\r
   IN CONST CHAR16  *Specific\r
   )\r


@@ -889,7 +870,6 @@ PerformMappingDelete(
 \r
 **/\r
 SHELL_STATUS\r
 \r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 AddMappingFromMapping(\r
   IN CONST CHAR16     *Map,\r
   IN CONST CHAR16     *SName\r
 AddMappingFromMapping(\r
   IN CONST CHAR16     *Map,\r
   IN CONST CHAR16     *SName\r


@@ -898,14 +878,18 @@ AddMappingFromMapping(
   CONST EFI_DEVICE_PATH_PROTOCOL  *DevPath;\r
   EFI_STATUS                      Status;\r
   CHAR16                          *NewSName;\r
   CONST EFI_DEVICE_PATH_PROTOCOL  *DevPath;\r
   EFI_STATUS                      Status;\r
   CHAR16                          *NewSName;\r

+  RETURN_STATUS                   StrRetStatus;\r

   \r
   \r

-  NewSName = AllocateZeroPool(StrSize(SName) + sizeof(CHAR16));\r
+  NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);\r

   if (NewSName == NULL) {\r
     return (SHELL_OUT_OF_RESOURCES);\r
   }\r
   if (NewSName == NULL) {\r
     return (SHELL_OUT_OF_RESOURCES);\r
   }\r

-  StrCpy(NewSName, SName);\r

   if (NewSName[StrLen(NewSName)-1] != L':') {\r
   if (NewSName[StrLen(NewSName)-1] != L':') {\r

-    StrCat(NewSName, L":");\r
+    StrRetStatus = StrnCatS(NewSName, (StrSize(SName) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));\r
+    if (EFI_ERROR(StrRetStatus)) {\r
+      FreePool(NewSName);\r
+      return ((SHELL_STATUS) (StrRetStatus & (~MAX_BIT)));\r
+    }\r

   }\r
 \r
   if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r
   }\r
 \r
   if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r


@@ -942,7 +926,6 @@ AddMappingFromMapping(
 \r
 **/\r
 SHELL_STATUS\r
 \r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 AddMappingFromHandle(\r
   IN CONST EFI_HANDLE Handle,\r
   IN CONST CHAR16     *SName\r
 AddMappingFromHandle(\r
   IN CONST EFI_HANDLE Handle,\r
   IN CONST CHAR16     *SName\r


@@ -951,14 +934,18 @@ AddMappingFromHandle(
   EFI_DEVICE_PATH_PROTOCOL  *DevPath;\r
   EFI_STATUS                Status;\r
   CHAR16                    *NewSName;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevPath;\r
   EFI_STATUS                Status;\r
   CHAR16                    *NewSName;\r

+  RETURN_STATUS             StrRetStatus;\r

   \r
   \r

-  NewSName = AllocateZeroPool(StrSize(SName) + sizeof(CHAR16));\r
+  NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);\r

   if (NewSName == NULL) {\r
     return (SHELL_OUT_OF_RESOURCES);\r
   }\r
   if (NewSName == NULL) {\r
     return (SHELL_OUT_OF_RESOURCES);\r
   }\r

-  StrCpy(NewSName, SName);\r

   if (NewSName[StrLen(NewSName)-1] != L':') {\r
   if (NewSName[StrLen(NewSName)-1] != L':') {\r

-    StrCat(NewSName, L":");\r
+    StrRetStatus = StrnCatS(NewSName, (StrSize(SName) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));\r
+    if (EFI_ERROR(StrRetStatus)) {\r
+      FreePool(NewSName);\r
+      return ((SHELL_STATUS) (StrRetStatus & (~MAX_BIT)));\r
+    }\r

   }\r
 \r
   if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r
   }\r
 \r
   if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r


@@ -998,6 +985,57 @@ STATIC CONST SHELL_PARAM_ITEM MapParamList[] = {
   {NULL, TypeMax}\r
   };\r
 \r
   {NULL, TypeMax}\r
   };\r
 \r

+/**\r
+  The routine issues dummy read for every physical block device to cause\r
+  the BlockIo re-installed if media change happened.\r
+**/\r
+VOID\r
+ProbeForMediaChange (\r
+  VOID\r
+  )\r
+{\r
+  EFI_STATUS                            Status;\r
+  UINTN                                 HandleCount;\r
+  EFI_HANDLE                            *Handles;\r
+  EFI_BLOCK_IO_PROTOCOL                 *BlockIo;\r
+  UINTN                                 Index;\r
+\r
+  gBS->LocateHandleBuffer (\r
+         ByProtocol,\r
+         &gEfiBlockIoProtocolGuid,\r
+         NULL,\r
+         &HandleCount,\r
+         &Handles\r
+         );\r
+  //\r
+  // Probe for media change for every physical block io\r
+  //\r
+  for (Index = 0; Index < HandleCount; Index++) {\r
+    Status = gBS->HandleProtocol (\r
+                    Handles[Index],\r
+                    &gEfiBlockIoProtocolGuid,\r
+                    (VOID **) &BlockIo\r
+                    );\r
+    if (!EFI_ERROR (Status)) {\r
+      if (!BlockIo->Media->LogicalPartition) {\r
+        //\r
+        // Per spec:\r
+        //   The function (ReadBlocks) must return EFI_NO_MEDIA or\r
+        //   EFI_MEDIA_CHANGED even if LBA, BufferSize, or Buffer are invalid so the caller can probe\r
+        //   for changes in media state.\r
+        //\r
+        BlockIo->ReadBlocks (\r
+                   BlockIo,\r
+                   BlockIo->Media->MediaId,\r
+                   0,\r
+                   0,\r
+                   NULL\r
+                   );\r
+      }\r
+    }\r
+  }\r
+}\r
+\r

 /**\r
   Function for 'map' command.\r
 \r
 /**\r
   Function for 'map' command.\r
 \r


@@ -1017,7 +1055,6 @@ ShellCommandRunMap (
   CONST CHAR16  *SName;\r
   CONST CHAR16  *Mapping;\r
   EFI_HANDLE    MapAsHandle;\r
   CONST CHAR16  *SName;\r
   CONST CHAR16  *Mapping;\r
   EFI_HANDLE    MapAsHandle;\r

-  CONST EFI_DEVICE_PATH_PROTOCOL *DevPath;\r

   SHELL_STATUS  ShellStatus;\r
   BOOLEAN       SfoMode;\r
   BOOLEAN       ConstMode;\r
   SHELL_STATUS  ShellStatus;\r
   BOOLEAN       SfoMode;\r
   BOOLEAN       ConstMode;\r


@@ -1029,7 +1066,6 @@ ShellCommandRunMap (
   ProblemParam  = NULL;\r
   Mapping       = NULL;\r
   SName         = NULL;\r
   ProblemParam  = NULL;\r
   Mapping       = NULL;\r
   SName         = NULL;\r

-  DevPath       = NULL;\r

   ShellStatus   = SHELL_SUCCESS;\r
   MapAsHandle = NULL;\r
 \r
   ShellStatus   = SHELL_SUCCESS;\r
   MapAsHandle = NULL;\r
 \r


@@ -1048,7 +1084,7 @@ ShellCommandRunMap (
   Status = ShellCommandLineParse (MapParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
   Status = ShellCommandLineParse (MapParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, ProblemParam);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"map", ProblemParam);  \r

       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r


@@ -1064,7 +1100,7 @@ ShellCommandRunMap (
     if (ShellCommandLineGetFlag(Package, L"-?")) {\r
       ASSERT(FALSE);\r
     } else if (ShellCommandLineGetRawValue(Package, 3) != NULL) {\r
     if (ShellCommandLineGetFlag(Package, L"-?")) {\r
       ASSERT(FALSE);\r
     } else if (ShellCommandLineGetRawValue(Package, 3) != NULL) {\r

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"map");  \r

       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       //\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       //\r


@@ -1078,29 +1114,26 @@ ShellCommandRunMap (
           || ShellCommandLineGetFlag(Package, L"-u")\r
           || ShellCommandLineGetFlag(Package, L"-t")\r
          ){\r
           || ShellCommandLineGetFlag(Package, L"-u")\r
           || ShellCommandLineGetFlag(Package, L"-t")\r
          ){\r

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle);\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"map");  \r

           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
           SName = ShellCommandLineGetValue(Package, L"-d");\r
           if (SName != NULL) {\r
             Status = PerformMappingDelete(SName);\r
             if (EFI_ERROR(Status)) {\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
           SName = ShellCommandLineGetValue(Package, L"-d");\r
           if (SName != NULL) {\r
             Status = PerformMappingDelete(SName);\r
             if (EFI_ERROR(Status)) {\r

-              switch (Status) {\r
-                case EFI_ACCESS_DENIED:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle);\r
-                  ShellStatus = SHELL_ACCESS_DENIED;\r
-                  break;\r
-                case EFI_NOT_FOUND:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, SName);\r
-                  ShellStatus = SHELL_INVALID_PARAMETER;\r
-                  break;\r
-                default:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);\r
-                  ShellStatus = SHELL_UNSUPPORTED;\r
+              if (Status == EFI_ACCESS_DENIED) {\r
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");  \r
+                ShellStatus = SHELL_ACCESS_DENIED;\r
+              } else if (Status == EFI_NOT_FOUND) {\r
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", SName);  \r
+                ShellStatus = SHELL_INVALID_PARAMETER;\r
+              } else {\r
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);  \r
+                ShellStatus = SHELL_UNSUPPORTED;\r

               }\r
             }\r
           } else {\r
               }\r
             }\r
           } else {\r

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle);\r
+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");  \r

             ShellStatus = SHELL_INVALID_PARAMETER;\r
           }\r
         }\r
             ShellStatus = SHELL_INVALID_PARAMETER;\r
           }\r
         }\r


@@ -1111,13 +1144,14 @@ ShellCommandRunMap (
                || ShellCommandLineGetFlag(Package, L"-u")\r
                || ShellCommandLineGetFlag(Package, L"-t")\r
               ){\r
                || ShellCommandLineGetFlag(Package, L"-u")\r
                || ShellCommandLineGetFlag(Package, L"-t")\r
               ){\r

+        ProbeForMediaChange ();\r

         if ( ShellCommandLineGetFlag(Package, L"-r")) {\r
           //\r
           // Do the reset\r
           //\r
           Status = ShellCommandCreateInitialMappingsAndPaths();\r
           if (EFI_ERROR(Status)) {\r
         if ( ShellCommandLineGetFlag(Package, L"-r")) {\r
           //\r
           // Do the reset\r
           //\r
           Status = ShellCommandCreateInitialMappingsAndPaths();\r
           if (EFI_ERROR(Status)) {\r

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);\r
+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);  \r

             ShellStatus = SHELL_UNSUPPORTED;\r
           }\r
         }\r
             ShellStatus = SHELL_UNSUPPORTED;\r
           }\r
         }\r


@@ -1125,9 +1159,9 @@ ShellCommandRunMap (
           //\r
           // Do the Update\r
           //\r
           //\r
           // Do the Update\r
           //\r

-          Status = UpdateMapping();\r
+          Status = ShellCommandUpdateMapping ();\r

           if (EFI_ERROR(Status)) {\r
           if (EFI_ERROR(Status)) {\r

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);\r
+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);  \r

             ShellStatus = SHELL_UNSUPPORTED;\r
           }\r
         }\r
             ShellStatus = SHELL_UNSUPPORTED;\r
           }\r
         }\r


@@ -1207,54 +1241,51 @@ ShellCommandRunMap (
             MapAsHandle = NULL;\r
           }\r
           if (MapAsHandle == NULL && Mapping[StrLen(Mapping)-1] != L':') {\r
             MapAsHandle = NULL;\r
           }\r
           if (MapAsHandle == NULL && Mapping[StrLen(Mapping)-1] != L':') {\r

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, Mapping);\r
+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);  \r

             ShellStatus = SHELL_INVALID_PARAMETER;\r
           } else {\r
             ShellStatus = SHELL_INVALID_PARAMETER;\r
           } else {\r

-            if (MapAsHandle != NULL) {\r
-              TempStringLength = StrLen(SName);\r
-              if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, SName);\r
-                ShellStatus = SHELL_INVALID_PARAMETER;\r
-              } else {\r
+            TempStringLength = StrLen(SName);\r
+            if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
+              ShellStatus = SHELL_INVALID_PARAMETER;\r
+            }\r
+\r
+            if (ShellStatus == SHELL_SUCCESS) {\r
+              if (MapAsHandle != NULL) {\r

                 ShellStatus = AddMappingFromHandle(MapAsHandle, SName);\r
                 ShellStatus = AddMappingFromHandle(MapAsHandle, SName);\r

-              }\r
-            } else {\r
-              TempStringLength = StrLen(SName);\r
-              if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, SName);\r
-                ShellStatus = SHELL_INVALID_PARAMETER;\r

               } else {\r
                 ShellStatus = AddMappingFromMapping(Mapping, SName);\r
               }\r
               } else {\r
                 ShellStatus = AddMappingFromMapping(Mapping, SName);\r
               }\r

+\r
+              if (ShellStatus != SHELL_SUCCESS) {\r
+                switch (ShellStatus) {\r
+                  case SHELL_ACCESS_DENIED:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
+                    break;\r
+                  case SHELL_INVALID_PARAMETER:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
+                    break;\r
+                  case SHELL_DEVICE_ERROR:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);\r
+                    break;\r
+                  default:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);\r
+                }\r
+              } else {\r
+                //\r
+                // now do the display...\r
+                //\r
+                ShellStatus = PerformMappingDisplay(\r
+                  FALSE,\r
+                  FALSE,\r
+                  FALSE,\r
+                  NULL,\r
+                  SfoMode,\r
+                  SName,\r
+                  TRUE\r
+                 );\r
+              } // we were sucessful so do an output\r

             }\r
             }\r

-            if (ShellStatus != SHELL_SUCCESS) {\r
-              switch (ShellStatus) {\r
-                case SHELL_ACCESS_DENIED:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle);\r
-                  break;\r
-                case SHELL_INVALID_PARAMETER:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle);\r
-                  break;\r
-                case SHELL_DEVICE_ERROR:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, Mapping);\r
-                  break;\r
-                default:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, ShellStatus|MAX_BIT);\r
-              }\r
-            } else {\r
-              //\r
-              // now do the display...\r
-              //\r
-              ShellStatus = PerformMappingDisplay(\r
-                FALSE,\r
-                FALSE,\r
-                FALSE,\r
-                NULL,\r
-                SfoMode,\r
-                SName,\r
-                TRUE\r
-               );\r
-            } // we were sucessful so do an output\r

           } // got a valid map target\r
         } // got 2 variables\r
       } // we are adding a mapping\r
           } // got a valid map target\r
         } // got 2 variables\r
       } // we are adding a mapping\r