mapped_file_handle::read() and write() was not detecting when VA space had been exhausted, and was incorrectly segfaulting the process rather than returning errc::not_enough_memory.

1 files changed, 16 insertions, 0 deletions

diff --git a/include/llfio/v2.0/mapped_file_handle.hpp b/include/llfio/v2.0/mapped_file_handle.hpp
index 3a8246e9..44b24ec5 100644
--- a/include/llfio/v2.0/mapped_file_handle.hpp
+++ b/include/llfio/v2.0/mapped_file_handle.hpp
@@ -197,6 +197,14 @@ protected:
   }
   LLFIO_HEADERS_ONLY_VIRTUAL_SPEC io_result<buffers_type> _do_read(io_request<buffers_type> reqs, deadline d = deadline()) noexcept override
   {
+    if(_mh.address() == nullptr)
+    {
+      OUTCOME_TRY(auto &&length, _sh.length());
+      if(length > 0)
+      {
+        return errc::not_enough_memory;  // reserve() failed probably due to VMA exhaustion
+      }
+    }
     return _mh.read(reqs, d);
   }
   LLFIO_HEADERS_ONLY_VIRTUAL_SPEC io_result<const_buffers_type> _do_write(io_request<const_buffers_type> reqs, deadline d = deadline()) noexcept override
@@ -229,6 +237,14 @@ protected:
       }
       return reqs.buffers;
     }
+    if(_mh.address() == nullptr)
+    {
+      OUTCOME_TRY(auto &&length, _sh.length());
+      if(length > 0)
+      {
+        return errc::not_enough_memory;  // reserve() failed probably due to VMA exhaustion
+      }
+    }
     return _mh.write(reqs, d);
   }