This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH][BZ #16046] Static dlopen correction fallout fixes
- From: "Maciej W. Rozycki" <macro at codesourcery dot com>
- To: Roland McGrath <roland at hack dot frob dot com>, Allan McRae <allan at archlinux dot org>
- Cc: Ondřej Bílka <neleai at seznam dot cz>, <libc-alpha at sourceware dot org>
- Date: Fri, 31 Jan 2014 19:12:54 +0000
- Subject: Re: [PATCH][BZ #16046] Static dlopen correction fallout fixes
- Authentication-results: sourceware.org; auth=none
- References: <20131017174710 dot GA4993 at domone dot podge> <20131025210328 dot 39E69746B6 at topped-with-meat dot com> <alpine dot DEB dot 1 dot 10 dot 1310252347350 dot 12843 at tp dot orcam dot me dot uk> <20140116203847 dot GB20838 at domone dot podge> <alpine dot DEB dot 1 dot 10 dot 1401172303320 dot 4268 at tp dot orcam dot me dot uk> <20140117233957 dot 64E307441B at topped-with-meat dot com> <alpine dot DEB dot 1 dot 10 dot 1401271320170 dot 4268 at tp dot orcam dot me dot uk> <alpine dot DEB dot 1 dot 10 dot 1401291054290 dot 4268 at tp dot orcam dot me dot uk> <20140129184954 dot 1BFFA74441 at topped-with-meat dot com> <alpine dot DEB dot 1 dot 10 dot 1401300707090 dot 4268 at tp dot orcam dot me dot uk> <20140130203835 dot EB0A874414 at topped-with-meat dot com>
On Thu, 30 Jan 2014, Roland McGrath wrote:
> That looks fine. Go ahead and commit it. Please do follow up on figuring
> out a good test case.
Thank you both for the review. I have applied the change now.
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.
WDYT?
2014-01-31 Maciej W. Rozycki <macro@codesourcery.com>
[BZ #16046]
elf/tst-dl-iter-static.c: New file.
elf/Makefile (tests-static): Add tst-dl-iter-static.
Maciej
glibc-static-dlopen-16046-test.diff
Index: glibc-fsf-trunk-quilt/elf/Makefile
===================================================================
--- glibc-fsf-trunk-quilt.orig/elf/Makefile 2014-01-29 12:29:54.000000000 +0000
+++ glibc-fsf-trunk-quilt/elf/Makefile 2014-01-31 18:09:48.501960005 +0000
@@ -123,7 +123,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-01-31 18:43:58.831961683 +0000
@@ -0,0 +1,42 @@
+/* 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
+ <http://www.gnu.org/licenses/>. */
+
+#define _GNU_SOURCE
+
+#include <link.h>
+
+static int count;
+
+static int
+callback (struct dl_phdr_info *info, size_t size, void *data)
+{
+ if (!*info->dlpi_name)
+ count++;
+
+ return 0;
+}
+
+int
+main(void)
+{
+ int status;
+
+ status = dl_iterate_phdr (callback, NULL);
+
+ return status || count != 1;
+}