[src/netbsd-6-1]: src/libexec/ld.elf_so Pull up following revision(s) (reques...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dce8bf68fa22
branches:  netbsd-6-1
changeset: 776071:dce8bf68fa22
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Apr 17 09:31:55 2015 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #1288):
        libexec/ld.elf_so/rtld.c: revision 1.176
lib/49813: Release mutex on error.

diffstat:

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

diffs (27 lines):

diff -r abb49b8d3c03 -r dce8bf68fa22 libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Thu Apr 16 13:40:30 2015 +0000
+++ b/libexec/ld.elf_so/rtld.c  Fri Apr 17 09:31:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $        */
+/*     $NetBSD: rtld.c,v 1.155.2.1.2.1 2015/04/17 09:31:55 msaitoh Exp $        */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.155.2.1.2.1 2015/04/17 09:31:55 msaitoh Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1219,7 +1219,7 @@
        obj = _rtld_obj_from_addr(addr);
        if (obj == NULL) {
                _rtld_error("No shared object contains address");
-               lookup_mutex_enter();
+               lookup_mutex_exit();
                return 0;
        }
        info->dli_fname = obj->path;