Fix component name bugs when input Controller Name is invalid

[mirror_edk2.git] / EdkUnixPkg / Dxe / UnixThunk / Bus / Console / ComponentName.c

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ComponentName.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ComponentName.c
index abfb328f60d847b9f32a4529f425bcdf4b0a432d..1bbe1cc49bd1dc414f8f9d2e08c113c6da110dff 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ComponentName.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ComponentName.c
@@ -160,7 +160,17 @@ UnixConsoleComponentNameGetControllerName (
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
-\r
+  //\r
+  // Make sure this driver is currently managing ControllerHandle\r
+  //\r
+  Status = EfiTestManagedDevice (\r
+             ControllerHandle,\r
+             gUnixConsoleDriverBinding.DriverBindingHandle,\r
+             &gEfiUnixIoProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
   //\r
   // Get out context back\r
   //\r