diff options
| -rw-r--r-- | sysdeps/mach/hurd/bits/mman_ext.h | 7 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/mmap.c | 26 |
2 files changed, 23 insertions, 10 deletions
diff --git a/sysdeps/mach/hurd/bits/mman_ext.h b/sysdeps/mach/hurd/bits/mman_ext.h index bbb94743e9..9658cdd658 100644 --- a/sysdeps/mach/hurd/bits/mman_ext.h +++ b/sysdeps/mach/hurd/bits/mman_ext.h @@ -22,5 +22,10 @@ #ifdef __USE_GNU # define SHM_ANON ((const char *) 1) -# define MAP_32BIT 0x1000 + +# define MAP_32BIT 0x1000 /* Map in the lower 2 GB. */ +# define MAP_EXCL 0x4000 /* With MAP_FIXED, don't replace existing mappings. */ + +# define MAP_TRYFIXED (MAP_FIXED | MAP_EXCL) /* BSD name. */ +# define MAP_FIXED_NOREPLACE (MAP_FIXED | MAP_EXCL) /* Linux name. */ #endif /* __USE_GNU */ diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c index 33672cf60a..20264a775b 100644 --- a/sysdeps/mach/hurd/mmap.c +++ b/sysdeps/mach/hurd/mmap.c @@ -46,6 +46,9 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) if ((mapaddr & (__vm_page_size - 1)) || (offset & (__vm_page_size - 1))) return (void *) (long int) __hurd_fail (EINVAL); + if ((flags & MAP_EXCL) && ! (flags & MAP_FIXED)) + return (void *) (long int) __hurd_fail (EINVAL); + vmprot = VM_PROT_NONE; if (prot & PROT_READ) vmprot |= VM_PROT_READ; @@ -156,15 +159,20 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) { if (err == KERN_NO_SPACE) { - /* XXX this is not atomic as it is in unix! */ - /* The region is already allocated; deallocate it first. */ - err = __vm_deallocate (__mach_task_self (), mapaddr, len); - if (! err) - err = __vm_map (__mach_task_self (), - &mapaddr, (vm_size_t) len, mask, - 0, memobj, (vm_offset_t) offset, - copy, vmprot, max_vmprot, - copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); + if (flags & MAP_EXCL) + err = EEXIST; + else + { + /* The region is already allocated; deallocate it first. */ + /* XXX this is not atomic as it is in unix! */ + err = __vm_deallocate (__mach_task_self (), mapaddr, len); + if (! err) + err = __vm_map (__mach_task_self (), + &mapaddr, (vm_size_t) len, mask, + 0, memobj, (vm_offset_t) offset, + copy, vmprot, max_vmprot, + copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); + } } } else |