Fix component name bugs when input Controller Name is invalid

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

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
index 2045f8fdd603b585bef1304c8ee1cf59472b0284..7ea1eacc1a3ce35d7073bd1f31e0ff5cfa1cdec4 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
@@ -154,6 +154,18 @@ UnixBusDriverComponentNameGetControllerName (
   EFI_UNIX_IO_PROTOCOL  *UnixIo;\r
   UNIX_IO_DEVICE        *Private;\r
 \r
+  //\r
+  // Make sure this driver is currently managing ControllHandle\r
+  //\r
+  Status = EfiTestManagedDevice (\r
+             ControllerHandle,\r
+             gUnixBusDriverBinding.DriverBindingHandle,\r
+             &gEfiUnixThunkProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
   //\r
   // This is a bus driver, so ChildHandle can not be NULL.\r
   //\r
@@ -161,6 +173,15 @@ UnixBusDriverComponentNameGetControllerName (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
+  Status = EfiTestChildHandle (\r
+             ControllerHandle,\r
+             ChildHandle,\r
+             &gEfiUnixThunkProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
   //\r
   // Get our context back\r
   //\r