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

The below code reads additional one CHAR16 when copying
content from Specific to NewSpecific.
NewSpecific = AllocateCopyPool(
                StrSize(Specific) + sizeof(CHAR16), Specific
                );

The patch fixes this issue.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 3f5925f507b7df330a61b6405e7a9565a6300c7d..9166ca2205ca2631a62c81aaf20505233c2ebdbc 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,7 +1,7 @@
 /** @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 - 2017, 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
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   \r


@@ -220,19 +220,25 @@ MappingListHasType(
   IN CONST BOOLEAN    Consist\r
   )\r
 {\r
   IN CONST BOOLEAN    Consist\r
   )\r
 {\r

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

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

-    NewSpecific = AllocateCopyPool(StrSize(Specific) + sizeof(CHAR16), Specific);\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

-    if (NewSpecific[StrLen(NewSpecific)-1] != L':') {\r
-      Status = StrnCatS(NewSpecific, (StrSize(Specific) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(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
       if (EFI_ERROR (Status)) {\r
         FreePool(NewSpecific);\r
         return FALSE;\r