From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from donkey.elm.relay.mailchannels.net (donkey.elm.relay.mailchannels.net [23.83.212.49]) by sourceware.org (Postfix) with ESMTPS id 74BF13857431 for ; Thu, 17 Jun 2021 12:57:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 74BF13857431 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id EC15122700; Thu, 17 Jun 2021 12:56:59 +0000 (UTC) Received: from pdx1-sub0-mail-a82.g.dreamhost.com (100-96-17-41.trex.outbound.svc.cluster.local [100.96.17.41]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 671EC22A2A; Thu, 17 Jun 2021 12:56:59 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a82.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.17.41 (trex/6.3.1); Thu, 17 Jun 2021 12:56:59 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-White-Chemical: 35871cea2b0b312c_1623934619685_3236003575 X-MC-Loop-Signature: 1623934619685:4269353428 X-MC-Ingress-Time: 1623934619684 Received: from pdx1-sub0-mail-a82.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a82.g.dreamhost.com (Postfix) with ESMTP id ECAB789D4A; Thu, 17 Jun 2021 05:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gotplt.org; h=subject:to :references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=gotplt.org; bh=T2OeFK wTm7k/ot7DfJJMHRmF8lc=; b=BzsbBmwtCXtKd3knEOl1uWbfA/lcjAWxhWmlaH 4CNQ8vh+NIeKWT6E/thJYI3siWprcubXIR+MCjQYVZs+CpDyY7GtocXEHCEIp7J2 H6USjKgCucm+s+tRgoS0tbZEjlgdOaUh0Y5uDlbm97QFywzYWA3YS/oMI/FFhlK0 dnVfA= Received: from [192.168.1.126] (unknown [1.186.101.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a82.g.dreamhost.com (Postfix) with ESMTPSA id 2E8CC89D5A; Thu, 17 Jun 2021 05:56:56 -0700 (PDT) Subject: Re: [PATCH] elf: Use _dl_catch_error from base namespace in dl-libc.c [BZ #27646] To: Florian Weimer , libc-alpha@sourceware.org References: <87czsook3i.fsf@oldenburg.str.redhat.com> X-DH-BACKEND: pdx1-sub0-mail-a82 From: Siddhesh Poyarekar Message-ID: Date: Thu, 17 Jun 2021 18:26:51 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <87czsook3i.fsf@oldenburg.str.redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3037.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2021 12:57:04 -0000 On 6/14/21 3:15 PM, Florian Weimer via Libc-alpha wrote: > dlerrror_run in elf/dl-libc.c needs to call GLRO (dl_catch_error) > from the base namespace, just like the exported dlerror > implementation. > > Fixes commit b2964eb1d9a6b8ab1250e8a881cf406182da5875 ("dlfcn: > Failures after dlmopen should not terminate process [BZ #24772]"). > > Tested on i686-linux-gnu and x86_64-linux-gnu. LGTM. Reviewed-by: Siddhesh Poyarekar > --- > elf/Makefile | 5 ++++- > elf/dl-libc.c | 4 ++-- > elf/tst-dlmopen-gethostbyname-mod.c | 29 +++++++++++++++++++++++++++++ > elf/tst-dlmopen-gethostbyname.c | 31 +++++++++++++++++++++++++++++++ > 4 files changed, 66 insertions(+), 3 deletions(-) > > diff --git a/elf/Makefile b/elf/Makefile > index 5c47daee12..38d08e03b8 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -223,7 +223,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ > tst-single_threaded tst-single_threaded-pthread \ > tst-tls-ie tst-tls-ie-dlmopen argv0test \ > tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ > - tst-tls20 tst-tls21 tst-dlmopen-dlerror > + tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname > # reldep9 > tests-internal += loadtest unload unload2 circleload1 \ > neededtest neededtest2 neededtest3 neededtest4 \ > @@ -347,6 +347,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ > libmarkermod4-1 libmarkermod4-2 libmarkermod4-3 libmarkermod4-4 \ > tst-tls20mod-bad tst-tls21mod tst-dlmopen-dlerror-mod \ > tst-auxvalmod \ > + tst-dlmopen-gethostbyname-mod \ > > # Most modules build with _ISOMAC defined, but those filtered out > # depend on internal headers. > @@ -1832,3 +1833,5 @@ $(objpfx)tst-tls21mod.so: $(tst-tls-many-dynamic-modules:%=$(objpfx)%.so) > > $(objpfx)tst-getauxval-static.out: $(objpfx)tst-auxvalmod.so > tst-getauxval-static-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx) > + > +$(objpfx)tst-dlmopen-gethostbyname.out: $(objpfx)tst-dlmopen-gethostbyname-mod.so > diff --git a/elf/dl-libc.c b/elf/dl-libc.c > index 8e0734f44c..a49df22029 100644 > --- a/elf/dl-libc.c > +++ b/elf/dl-libc.c > @@ -43,8 +43,8 @@ dlerror_run (void (*operate) (void *), void *args) > const char *last_errstring = NULL; > bool malloced; > > - int result = (_dl_catch_error (&objname, &last_errstring, &malloced, > - operate, args) > + int result = (GLRO (dl_catch_error) (&objname, &last_errstring, &malloced, > + operate, args) > ?: last_errstring != NULL); > > if (result && malloced) > diff --git a/elf/tst-dlmopen-gethostbyname-mod.c b/elf/tst-dlmopen-gethostbyname-mod.c > new file mode 100644 > index 0000000000..9a68ea5050 > --- /dev/null > +++ b/elf/tst-dlmopen-gethostbyname-mod.c > @@ -0,0 +1,29 @@ > +/* Exercise dlerror_run in elf/dl-libc.c after dlmopen, via NSS. Helper module. > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > + > +void > +call_gethostbyname (void) > +{ > + __nss_configure_lookup ("hosts", "files"); > + /* This should not terminate the process due to a missing > + _nss_files_getcanonname_r symbol. */ > + gethostbyname ("localhost"); > +} > diff --git a/elf/tst-dlmopen-gethostbyname.c b/elf/tst-dlmopen-gethostbyname.c > new file mode 100644 > index 0000000000..12deb29900 > --- /dev/null > +++ b/elf/tst-dlmopen-gethostbyname.c > @@ -0,0 +1,31 @@ > +/* Exercise dlerror_run in elf/dl-libc.c after dlmopen, via NSS (bug 27646). > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > + > +static int > +do_test (void) > +{ > + void *handle = xdlmopen (LM_ID_NEWLM, "tst-dlmopen-gethostbyname-mod.so", > + RTLD_NOW); > + void (*call_gethostbyname) (void) = xdlsym (handle, "call_gethostbyname"); > + call_gethostbyname (); > + return 0; > +} > + > +#include >