From: Vincent Mihalkovic <vmihalko@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH] ld.so: add an --argv0 option
Date: Wed, 22 Jul 2020 10:33:45 +0200 [thread overview]
Message-ID: <CALjvMRXfEQA7j8LKQYJqCTdO+qcUuAoSbBXSe9FBa9zPgE82Vw@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
Hi,
a few years ago there was an effort for adding --argv0 option:
https://sourceware.org/legacy-ml/libc-alpha/2016-04/msg00576.html.
I made the old patch actual for version 2.31.9000, added a test case and
changelog.
[-- Attachment #2: changelog.txt --]
[-- Type: text/plain, Size: 240 bytes --]
2020-07-22 Vincent Mihalkovic <vmihalko@redhat.com>
* elf/Makefile: added argv0 test case, Modified.
* elf/rtld.c: added --argv0 option, Modified.
* elf/argv0test.c: test case, New file.
* elf/tst-rtld-argv0.sh: test case, New file.
[-- Attachment #3: argv0.patch --]
[-- Type: text/x-patch, Size: 4788 bytes --]
diff --git a/elf/Makefile b/elf/Makefile
index 0b78721848..f38904d831 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -210,7 +210,8 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \
tst-filterobj tst-filterobj-dlopen tst-auxobj tst-auxobj-dlopen \
tst-audit14 tst-audit15 tst-audit16 \
tst-single_threaded tst-single_threaded-pthread \
- tst-tls-ie tst-tls-ie-dlmopen
+ tst-tls-ie tst-tls-ie-dlmopen \
+ argv0test
# reldep9
tests-internal += loadtest unload unload2 circleload1 \
neededtest neededtest2 neededtest3 neededtest4 \
@@ -414,7 +415,7 @@ endif
ifeq (yes,$(build-shared))
ifeq ($(run-built-tests),yes)
tests-special += $(objpfx)tst-pathopt.out $(objpfx)tst-rtld-load-self.out \
- $(objpfx)tst-rtld-preload.out
+ $(objpfx)tst-rtld-preload.out $(objpfx)argv0test.out
endif
tests-special += $(objpfx)check-textrel.out $(objpfx)check-execstack.out \
$(objpfx)check-wx-segment.out \
@@ -1796,3 +1797,11 @@ $(objpfx)tst-tls-ie-dlmopen.out: \
$(objpfx)tst-tls-ie-mod6.so
$(objpfx)tst-tls-surplus: $(libdl)
+
+ARGV0 = test-argv0
+$(objpfx)argv0test.out: tst-rtld-argv0.sh $(objpfx)ld.so \
+ $(objpfx)argv0test
+ $(SHELL) $< $(objpfx)ld.so $(objpfx)argv0test \
+ '$(test-wrapper-env)' '$(run_program_env)' \
+ '$(rpath-link)' '$(ARGV0)' > $@; \
+ $(evaluate-test)
diff --git a/elf/argv0test.c b/elf/argv0test.c
new file mode 100644
index 0000000000..4c79bebf23
--- /dev/null
+++ b/elf/argv0test.c
@@ -0,0 +1,13 @@
+#include <stdio.h> // for printf
+#include <string.h> // for strcmp
+
+
+int main( int argc, char *argv[] ) {
+ int result = strcmp( argv[0], "test-argv0");
+
+ printf ("argv[0] = %s, strcmp( argv[0], \"test-argv0\" ) = %d, %s\n", \
+ argv[0], result, !result ? "ok" : "wrong");
+
+ return result;
+
+}
diff --git a/elf/rtld.c b/elf/rtld.c
index 5b882163fa..cafa4f9bd3 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1202,6 +1202,8 @@ dl_main (const ElfW(Phdr) *phdr,
installing it. */
rtld_is_main = true;
+ char *argv0 = NULL;
+
/* Note the place where the dynamic linker actually came from. */
GL(dl_rtld_map).l_name = rtld_progname;
@@ -1259,6 +1261,14 @@ dl_main (const ElfW(Phdr) *phdr,
else if (! strcmp (_dl_argv[1], "--preload") && _dl_argc > 2)
{
preloadarg = _dl_argv[2];
+ _dl_skip_args += 2;
+ _dl_argc -= 2;
+ _dl_argv += 2;
+ }
+ else if (! strcmp (_dl_argv[1], "--argv0") && _dl_argc > 2)
+ {
+ argv0 = _dl_argv[2];
+
_dl_skip_args += 2;
_dl_argc -= 2;
_dl_argv += 2;
@@ -1292,7 +1302,8 @@ of this helper program; chances are you did not intend to run this program.\n\
--inhibit-rpath LIST ignore RUNPATH and RPATH information in object names\n\
in LIST\n\
--audit LIST use objects named in LIST as auditors\n\
- --preload LIST preload objects named in LIST\n");
+ --preload LIST preload objects named in LIST\n\
+ --argv0 STRING set argv[0] to STRING before running\n");
++_dl_skip_args;
--_dl_argc;
@@ -1384,6 +1395,11 @@ of this helper program; chances are you did not intend to run this program.\n\
break;
}
#endif
+
+ /* Set the argv[0] string now that we've processed the executable. */
+ if (argv0 != NULL) {
+ _dl_argv[0] = argv0;
+ }
}
else
{
diff --git a/elf/tst-rtld-argv0.sh b/elf/tst-rtld-argv0.sh
new file mode 100755
index 0000000000..5f873b6c5c
--- /dev/null
+++ b/elf/tst-rtld-argv0.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Test --argv0 argument ld.so.
+# Copyright (C) 2019-2020 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
+# <https://www.gnu.org/licenses/>.
+
+set -e
+
+rtld=$1
+test_program=$2
+test_wrapper_env=$3
+run_program_env=$4
+library_path=$5
+argv0=$6
+
+echo "# [${test_wrapper_env}] [${run_program_env}] [$rtld] [--library-path]" \
+ "[$library_path] [--argv0] [$argv0] [$test_program]"
+${test_wrapper_env} \
+${run_program_env} \
+$rtld --library-path "$library_path" \
+ --argv0 "$argv0" $test_program 2>&1 && rc=0 || rc=$?
+echo "# exit status $rc"
+
+exit $rc
next reply other threads:[~2020-07-22 8:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 8:33 Vincent Mihalkovic [this message]
2020-07-22 9:00 ` Florian Weimer
2020-07-26 20:00 ` Vincent Mihalkovic
2020-07-27 5:54 ` Florian Weimer
-- strict thread matches above, loose matches on Subject: below --
2020-08-12 11:06 Vincent Mihalkovic
2020-08-25 15:10 ` Adhemerval Zanella
2016-04-23 5:28 Mike Frysinger
2016-04-23 12:21 ` Florian Weimer
2016-04-23 20:06 ` Mike Frysinger
2016-04-24 12:21 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CALjvMRXfEQA7j8LKQYJqCTdO+qcUuAoSbBXSe9FBa9zPgE82Vw@mail.gmail.com \
--to=vmihalko@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).