OvmfPkg/VirtioBlkDxe: Check the return status of unmap data buffer

[mirror_edk2.git] / OvmfPkg / VirtioBlkDxe / VirtioBlk.c

diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
index 6abd937f86c6c2c677d04b2652b465d0568937e1..5a63986b3f39ffb19c57ccfcabeb7d2ce7e327b0 100644 (file)
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
@@ -260,6 +260,7 @@ SynchronousRequest (
   EFI_PHYSICAL_ADDRESS    HostStatusDeviceAddress;\r
   EFI_PHYSICAL_ADDRESS    RequestDeviceAddress;\r
   EFI_STATUS              Status;\r
+  EFI_STATUS              UnmapStatus;\r
 \r
   BlockSize = Dev->BlockIoMedia.BlockSize;\r
 \r
@@ -430,7 +431,13 @@ SynchronousRequest (
 \r
 UnmapDataBuffer:\r
   if (BufferSize > 0) {\r
-    Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, BufferMapping);\r
+    UnmapStatus = Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, BufferMapping);\r
+    if (EFI_ERROR (UnmapStatus) && !RequestIsWrite && !EFI_ERROR (Status)) {\r
+      //\r
+      // Data from the bus master may not reach the caller; fail the request.\r
+      //\r
+      Status = EFI_DEVICE_ERROR;\r
+    }\r
   }\r
 \r
 UnmapRequestBuffer:\r