Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so Fix c++ exceptions on arm; jemalloc calls ...



details:   https://anonhg.NetBSD.org/src/rev/5816d9610433
branches:  trunk
changeset: 450409:5816d9610433
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 13 03:15:25 2019 +0000

description:
Fix c++ exceptions on arm; jemalloc calls _rtld_tls_get_addr from inside
dl_iterate_phdr, so we need to unlock and relock.

diffstat:

 libexec/ld.elf_so/rtld.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 6616d03f3eaa -r 5816d9610433 libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Sat Apr 13 00:23:32 2019 +0000
+++ b/libexec/ld.elf_so/rtld.c  Sat Apr 13 03:15:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.195 2018/12/30 01:48:37 christos Exp $       */
+/*     $NetBSD: rtld.c,v 1.196 2019/04/13 03:15:25 christos Exp $       */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.195 2018/12/30 01:48:37 christos Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.196 2019/04/13 03:15:25 christos Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1462,7 +1462,9 @@
                phdr_info.dlpi_subs = _rtld_objloads - _rtld_objcount;
 
                /* XXXlocking: exit point */
+               _rtld_shared_exit();
                error = callback(&phdr_info, sizeof(phdr_info), param);
+               _rtld_shared_enter();
                if (error)
                        break;
        }



Home | Main Index | Thread Index | Old Index