public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/maskray/lld] hurd mmap: Factorize MAP_SHARED flag check
@ 2021-08-16 17:14 Fangrui Song
0 siblings, 0 replies; only message in thread
From: Fangrui Song @ 2021-08-16 17:14 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=08fc6df294ab7e10e14492094a99b7861ad7d77e
commit 08fc6df294ab7e10e14492094a99b7861ad7d77e
Author: Sergey Bugaev <bugaevc@gmail.com>
Date: Wed Aug 11 18:31:51 2021 +0200
hurd mmap: Factorize MAP_SHARED flag check
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diff:
---
sysdeps/mach/hurd/mmap.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c
index ea0e61d571..9fa265f752 100644
--- a/sysdeps/mach/hurd/mmap.c
+++ b/sysdeps/mach/hurd/mmap.c
@@ -37,6 +37,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
vm_prot_t vmprot;
memory_object_t memobj;
vm_address_t mapaddr;
+ boolean_t copy;
mapaddr = (vm_address_t) addr;
@@ -52,6 +53,8 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
if (prot & PROT_EXEC)
vmprot |= VM_PROT_EXECUTE;
+ copy = ! (flags & MAP_SHARED);
+
switch (flags & MAP_TYPE)
{
default:
@@ -98,7 +101,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
__mach_port_deallocate (__mach_task_self (), memobj);
}
else if (wobj == MACH_PORT_NULL /* Not writable by mapping. */
- && !(flags & MAP_SHARED))
+ && copy)
/* The file can only be mapped for reading. Since we are
making a private mapping, we will never try to write the
object anyway, so we don't care. */
@@ -123,9 +126,8 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
&mapaddr, (vm_size_t) len, (vm_address_t) 0,
mapaddr == 0,
memobj, (vm_offset_t) offset,
- ! (flags & MAP_SHARED),
- vmprot, VM_PROT_ALL,
- (flags & MAP_SHARED) ? VM_INHERIT_SHARE : VM_INHERIT_COPY);
+ copy, vmprot, VM_PROT_ALL,
+ copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE);
if (flags & MAP_FIXED)
{
@@ -138,10 +140,8 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
err = __vm_map (__mach_task_self (),
&mapaddr, (vm_size_t) len, (vm_address_t) 0,
0, memobj, (vm_offset_t) offset,
- ! (flags & MAP_SHARED),
- vmprot, VM_PROT_ALL,
- (flags & MAP_SHARED) ? VM_INHERIT_SHARE
- : VM_INHERIT_COPY);
+ copy, vmprot, VM_PROT_ALL,
+ copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE);
}
}
else
@@ -150,10 +150,8 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
err = __vm_map (__mach_task_self (),
&mapaddr, (vm_size_t) len, (vm_address_t) 0,
1, memobj, (vm_offset_t) offset,
- ! (flags & MAP_SHARED),
- vmprot, VM_PROT_ALL,
- (flags & MAP_SHARED) ? VM_INHERIT_SHARE
- : VM_INHERIT_COPY);
+ copy, vmprot, VM_PROT_ALL,
+ copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE);
}
if (memobj != MACH_PORT_NULL)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-16 17:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-16 17:14 [glibc/maskray/lld] hurd mmap: Factorize MAP_SHARED flag check Fangrui Song
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).