From patchwork Fri Jun 20 20:55:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 1624 Received: (qmail 17941 invoked by alias); 20 Jun 2014 20:55:20 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 17910 invoked by uid 89); 20 Jun 2014 20:55:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Fri, 20 Jun 2014 21:55:04 +0100 From: "Maciej W. Rozycki" To: Roland McGrath CC: Allan McRae , =?ISO-8859-2?Q?Ond=F8ej_B=EDlka?= , Subject: Re: [PATCH][BZ #16046] Static dlopen correction fallout fixes In-Reply-To: <20140206221305.052D574443@topped-with-meat.com> Message-ID: References: <20131017174710.GA4993@domone.podge> <20131025210328.39E69746B6@topped-with-meat.com> <20140116203847.GB20838@domone.podge> <20140117233957.64E307441B@topped-with-meat.com> <20140129184954.1BFFA74441@topped-with-meat.com> <20140130203835.EB0A874414@topped-with-meat.com> <20140131192948.2F8A774430@topped-with-meat.com> <20140203175942.7CA1074411@topped-with-meat.com> <20140206221305.052D574443@topped-with-meat.com> User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 On Thu, 6 Feb 2014, Roland McGrath wrote: > (The union hack was in fact wrong pedantically.) > > As it's adding a test for code changed in this cycle, I think it should go > in before the branch. It didn't happen as I didn't make it before the branch was created. I have committed it now; as it's been a while below is the patch and the original explanation again. I'm not sure if it's worth backporting to 2.19, probably not as it doesn't affect functionality (but let me know if you think otherwise). Maciej ---------------------------------------------------------------------------- Thinking more about the test case I have concluded that maybe a path-of-least-resistance check like below would do. It verifies that there's exactly one link map whose file name is null, as is the case with the main executable only. This approach may not be particularly robust, but it does cover what BZ #16046 is about. 2014-01-31 Maciej W. Rozycki [BZ #16046] * elf/tst-dl-iter-static.c: New file. * elf/Makefile (tests-static): Add tst-dl-iter-static. glibc-static-dlopen-16046-test.diff Index: glibc-fsf-trunk-quilt/elf/Makefile =================================================================== --- glibc-fsf-trunk-quilt.orig/elf/Makefile 2014-05-16 03:26:41.411962497 +0100 +++ glibc-fsf-trunk-quilt/elf/Makefile 2014-05-16 03:26:43.411965765 +0100 @@ -121,7 +121,7 @@ tests = tst-tls1 tst-tls2 tst-tls9 tst-l tst-auxv tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \ tst-leaks1-static tst-array1-static tst-array5-static \ - tst-ptrguard1-static + tst-ptrguard1-static tst-dl-iter-static ifeq (yes,$(build-shared)) tests-static += tst-tls9-static tst-tls9-static-ENV = \ Index: glibc-fsf-trunk-quilt/elf/tst-dl-iter-static.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ glibc-fsf-trunk-quilt/elf/tst-dl-iter-static.c 2014-05-16 03:26:43.411965765 +0100 @@ -0,0 +1,47 @@ +/* BZ #16046 dl_iterate_phdr static executable test. + Copyright (C) 2014 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 + +/* Check that the link map of the static executable itself is iterated + over exactly once. */ + +static int +callback (struct dl_phdr_info *info, size_t size, void *data) +{ + int *count = data; + + if (info->dlpi_name[0] == '\0') + (*count)++; + + return 0; +} + +static int +do_test (void) +{ + int count = 0; + int status; + + status = dl_iterate_phdr (callback, &count); + + return status || count != 1; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c"