ShellPkg/Dp: Add null pointer check

[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / DevTree.c

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
index a66bdec06b20c5de3b4dd9b2e4b1f61190bec5f4..6f070eeaa1fd4aec87bf6aaa86f979e58ff28f7c 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
@@ -1,7 +1,8 @@
 /** @file\r
   Main file for DevTree shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2016, 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
@@ -33,7 +34,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   @retval SHELL_SUCCESS     The operation was successful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 DoDevTreeForHandle(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST CHAR8      *Lang OPTIONAL,\r
@@ -56,7 +56,14 @@ DoDevTreeForHandle(
   ChildHandleBuffer   = NULL;\r
   ChildCount          = 0;\r
 \r
-  ASSERT(TheHandle    != NULL);\r
+  ASSERT (TheHandle != NULL);\r
+  ASSERT (HiiString != NULL);\r
+  \r
+  if (ShellGetExecutionBreakFlag()) {\r
+    ShellStatus = SHELL_ABORTED;\r
+    return ShellStatus;\r
+  }\r
+  \r
   //\r
   // We want controller handles.  they will not have LoadedImage or DriverBinding (or others...)\r
   //\r
@@ -84,28 +91,11 @@ DoDevTreeForHandle(
     return SHELL_SUCCESS;\r
   }\r
 \r
-  //\r
-  // If we are at the begining then we want root handles they have no parents and do have device path.\r
-  //\r
-  if (IndentCharCount == 0) {\r
-    Status = gBS->OpenProtocol (\r
-                  TheHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  NULL,\r
-                  NULL,\r
-                  NULL,\r
-                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
-                 );\r
-    if (EFI_ERROR (Status)) {\r
-      return SHELL_SUCCESS;\r
-    }\r
+  FormatString = AllocateZeroPool(StrSize(HiiString) + (10)*sizeof(FormatString[0]));\r
+  if (FormatString == NULL) {\r
+    return SHELL_OUT_OF_RESOURCES;\r
   }\r
 \r
-  FormatString        = AllocateZeroPool(StrSize(HiiString) + (10)*sizeof(FormatString[0]));\r
-\r
-  ASSERT(HiiString    != NULL);\r
-  ASSERT(FormatString != NULL);\r
-\r
   //\r
   // we generate the format string on the fly so that we can control the\r
   // number of space characters that the first (empty) string has.  this\r
@@ -136,6 +126,9 @@ DoDevTreeForHandle(
   ParseHandleDatabaseForChildControllers(TheHandle, &ChildCount, &ChildHandleBuffer);\r
   for (LoopVar = 0 ; LoopVar < ChildCount && ShellStatus == SHELL_SUCCESS; LoopVar++){\r
     ShellStatus = DoDevTreeForHandle(ChildHandleBuffer[LoopVar], Lang, UseDevPaths, IndentCharCount+2, HiiString);\r
+    if (ShellStatus == SHELL_ABORTED) {\r
+      break;\r
+    }\r
   }\r
 \r
   if (ChildHandleBuffer != NULL) {\r
@@ -169,6 +162,8 @@ ShellCommandRunDevTree (
   EFI_HANDLE          TheHandle;\r
   BOOLEAN             FlagD;\r
   UINT64              Intermediate;\r
+  UINTN               ParentControllerHandleCount;\r
+  EFI_HANDLE          *ParentControllerHandleBuffer;\r
 \r
   ShellStatus         = SHELL_SUCCESS;\r
   Status              = EFI_SUCCESS;\r
@@ -189,7 +184,7 @@ ShellCommandRunDevTree (
   Status = ShellCommandLineParse (ParamList, &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), gShellDriver1HiiHandle, ProblemParam);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devtree", ProblemParam);  \r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -197,7 +192,7 @@ ShellCommandRunDevTree (
     }\r
   } else {\r
     if (ShellCommandLineGetCount(Package) > 2) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devtree");  \r
       ShellCommandLineFreeVarList (Package);\r
       return (SHELL_INVALID_PARAMETER);\r
     }\r
@@ -211,7 +206,7 @@ ShellCommandRunDevTree (
 //      AsciiSPrint(Language, 10, "en-us");\r
     } else {\r
       ASSERT(Language == NULL);\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devtree",  L"-l");  \r
       ShellCommandLineFreeVarList (Package);\r
       return (SHELL_INVALID_PARAMETER);\r
     }\r
@@ -226,12 +221,45 @@ ShellCommandRunDevTree (
         if (TheHandle == NULL){\r
           break;\r
         }\r
+\r
+        //\r
+        // Skip handles that do not have device path protocol\r
+        //\r
+        Status = gBS->OpenProtocol (\r
+                      TheHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      NULL,\r
+                      NULL,\r
+                      NULL,\r
+                      EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+                     );\r
+        if (EFI_ERROR (Status)) {\r
+          continue;\r
+        }\r
+\r
+        //\r
+        // Skip handles that do have parents\r
+        //\r
+        ParentControllerHandleBuffer = NULL;\r
+        Status = PARSE_HANDLE_DATABASE_PARENTS (\r
+                   TheHandle,\r
+                   &ParentControllerHandleCount,\r
+                   &ParentControllerHandleBuffer\r
+                   );\r
+        SHELL_FREE_NON_NULL (ParentControllerHandleBuffer);\r
+        if (ParentControllerHandleCount > 0) {\r
+          continue;\r
+        }\r
+\r
+        //\r
+        // Start a devtree from TheHandle that has a device path and no parents\r
+        //\r
         ShellStatus = DoDevTreeForHandle(TheHandle, Language, FlagD, 0, HiiString);\r
       }\r
     } else {\r
       Status = ShellConvertStringToUint64(Lang, &Intermediate, TRUE, FALSE);\r
       if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Lang);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"devtree", Lang);  \r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
       } else {\r
         ShellStatus = DoDevTreeForHandle(ConvertHandleIndexToHandle((UINTN)Intermediate), Language, FlagD, 0, HiiString);\r