* fhandler.h (fhandler_base): New method `fixup_mmap_after_fork'.

        (fhandler_disk_file: Ditto.
        (fhandler_dev_mem): Ditto.
        * fhandler_mem.cc (fhandler_dev_mem::open): Set OBJ_INHERIT attribute
        for device\physicalmemory handle.
        (fhandler_dev_mem::mmap): Ditto.
        * fhandler_mem.cc (fhandler_dev_mem::fixup_mmap_after_fork): New method.
        * mmap.cc (mmap_record): Add private `fdesc_' member. Change constructor
        accordingly.
        (get_fd): New method.
        (mmap): Use new mmap_record constructor.
        (fhandler_base::fixup_mmap_after_fork): New method.
        (fhandler_disk_file::fixup_mmap_after_fork): Ditto.
        (fixup_mmaps_after_fork): Call `fixup_mmap_after_fork' of appropriate
        fhandler class.

1 files changed, 43 insertions, 2 deletions

diff --git a/winsup/cygwin/fhandler_mem.cc b/winsup/cygwin/fhandler_mem.cc
index 9c41dda0b..81bfdc66b 100644
--- a/winsup/cygwin/fhandler_mem.cc
+++ b/winsup/cygwin/fhandler_mem.cc
@@ -94,7 +94,9 @@ fhandler_dev_mem::open (const char *, int flags, mode_t)
   RtlInitUnicodeString (&memstr, L"\\device\\physicalmemory");
 
   OBJECT_ATTRIBUTES attr;
-  InitializeObjectAttributes(&attr, &memstr, OBJ_CASE_INSENSITIVE, NULL, NULL);
+  InitializeObjectAttributes(&attr, &memstr,
+  			     OBJ_CASE_INSENSITIVE | OBJ_INHERIT,
+			     NULL, NULL);
 
   ACCESS_MASK section_access;
   if ((flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_RDONLY)
@@ -277,7 +279,9 @@ fhandler_dev_mem::mmap (caddr_t *addr, size_t len, DWORD access,
   RtlInitUnicodeString (&memstr, L"\\device\\physicalmemory");
 
   OBJECT_ATTRIBUTES attr;
-  InitializeObjectAttributes(&attr, &memstr, OBJ_CASE_INSENSITIVE, NULL, NULL);
+  InitializeObjectAttributes(&attr, &memstr,
+			     OBJ_CASE_INSENSITIVE | OBJ_INHERIT,
+  			     NULL, NULL);
 
   ACCESS_MASK section_access;
   ULONG protect;
@@ -359,6 +363,43 @@ fhandler_dev_mem::msync (HANDLE h, caddr_t addr, size_t len, int flags)
   return 0;
 }
 
+BOOL
+fhandler_dev_mem::fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
+					 DWORD size, void *address)
+{
+  DWORD ret;
+  PHYSICAL_ADDRESS phys;
+  void *base = address;
+  DWORD dlen = size;
+  ULONG protect;
+
+  if (access & FILE_MAP_COPY)
+    protect = PAGE_WRITECOPY;
+  else if (access & FILE_MAP_WRITE)
+    protect = PAGE_READWRITE;
+  else
+    protect = PAGE_READONLY;
+
+  phys.QuadPart = (ULONGLONG) offset;
+
+  if ((ret = NtMapViewOfSection (h,
+				 INVALID_HANDLE_VALUE,
+				 &base,
+				 0L,
+				 dlen,
+				 &phys,
+				 &dlen,
+				 ViewShare /*??*/,
+				 0,
+				 protect)) != STATUS_SUCCESS)
+    {
+      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
+      syscall_printf ("-1 = fixup_mmap_after_fork(): NtMapViewOfSection failed with %E");
+      return FALSE;
+    }
+  return base == address;
+}
+
 int
 fhandler_dev_mem::fstat (struct stat *buf)
 {