Fix component name bugs when input Controller Name is invalid

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

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/ComponentName.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/ComponentName.c
index fd4b75e46fafe94227adf0cf009d12519f427aef..19085fd88a7c592a79070ebc46cad2927335b027 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/ComponentName.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/ComponentName.c
@@ -160,7 +160,17 @@ UnixBlockIoComponentNameGetControllerName (
   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
+             gUnixBlockIoDriverBinding.DriverBindingHandle,\r
+             &gEfiUnixIoProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
   //\r
   // Get our context back\r
   //\r