Fix component name bugs when input Controller Name is invalid

[mirror_edk2.git] / EdkModulePkg / Bus / Usb / UsbBot / Dxe / ComponentName.c

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c
index 6a9cf13456a7cfd01697396a27c8ba2d0ade4986..34ab75864f0c5ecee3d0bb8a4e8245db30ef3dd3 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/ComponentName.c
@@ -161,7 +161,17 @@ UsbBotComponentNameGetControllerName (
   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
+             gUsbBotDriverBinding.DriverBindingHandle,\r
+             &gEfiUsbIoProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
   //\r
   // Get the device context\r
   //\r