Fix component name bugs when input Controller Name is invalid

[mirror_edk2.git] / EdkModulePkg / Bus / Scsi / ScsiDisk / Dxe / ComponentName.c

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
index 15f02d6c41a22b53fea34991ffe9d088f52e79a4..e1d0f8d4700815ead489500cbfa2a20941a80ffc 100644 (file)
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
@@ -162,6 +162,17 @@ ScsiDiskComponentNameGetControllerName (
     return EFI_UNSUPPORTED;\r
   }\r
   \r
+  //\r
+  // Make sure this driver is currently managing ControllerHandle\r
+  //\r
+  Status = EfiTestManagedDevice (\r
+             ControllerHandle,\r
+             gScsiDiskDriverBinding.DriverBindingHandle,\r
+             &gEfiScsiIoProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
   //\r
   // Get the device context\r
   //\r