This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.24-323-g561ff1e


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  561ff1ec4251c8dca011dbcf7500b3970b2cf59b (commit)
      from  44c637ce806cc41534e89117a93c41fd310e7e3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=561ff1ec4251c8dca011dbcf7500b3970b2cf59b

commit 561ff1ec4251c8dca011dbcf7500b3970b2cf59b
Author: Brent W. Baccala <cosine@freesoft.org>
Date:   Mon Oct 31 17:31:56 2016 +0100

    hurd: Fix spurious port deallocation
    
    * sysdeps/mach/hurd/dl-sysdep.c (__mmap): Do not deallocate memobj_wr
    when it is MACH_PORT_NULL.

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;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |    5 +++++
 sysdeps/mach/hurd/dl-sysdep.c |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]