aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent W. Baccala <cosine@freesoft.org>2016-10-31 17:31:56 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-10-31 17:32:25 +0100
commit561ff1ec4251c8dca011dbcf7500b3970b2cf59b (patch)
tree3c6da59beb07a3673b496ee82cd282944a41fc29
parent44c637ce806cc41534e89117a93c41fd310e7e3f (diff)
downloadglibc-561ff1ec4251c8dca011dbcf7500b3970b2cf59b.zip
glibc-561ff1ec4251c8dca011dbcf7500b3970b2cf59b.tar.gz
glibc-561ff1ec4251c8dca011dbcf7500b3970b2cf59b.tar.bz2
hurd: Fix spurious port deallocation
* sysdeps/mach/hurd/dl-sysdep.c (__mmap): Do not deallocate memobj_wr when it is MACH_PORT_NULL.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e6d3121..1a14fdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-31 Brent W. Baccala <cosine@freesoft.org>
+
+ * sysdeps/mach/hurd/dl-sysdep.c (__mmap): Do not deallocate memobj_wr
+ when it is MACH_PORT_NULL.
+
2016-10-31 Andreas Schwab <schwab@suse.de>
[BZ #20707]
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 76140cf..d730f82 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -473,7 +473,8 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
err = __io_map ((mach_port_t) fd, &memobj_rd, &memobj_wr);
if (err)
return __hurd_fail (err), MAP_FAILED;
- __mach_port_deallocate (__mach_task_self (), memobj_wr);
+ if (memobj_wr != MACH_PORT_NULL)
+ __mach_port_deallocate (__mach_task_self (), memobj_wr);
}
mapaddr = (vm_address_t) addr;