From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 6C2691F66E for ; Wed, 26 Aug 2020 13:55:30 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 54C3E386F435; Wed, 26 Aug 2020 13:55:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 54C3E386F435 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1598450129; bh=RJUy9TrFLc4qKPN1XLzCPYpkbfxPb1bO6QaVY6udKj4=; h=To:References:Subject:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=yTt+henlQz/t9I+6yE73Tpr9uFoKgUP1+cZ13lRSSkUiJihJUh+E++t6xG6c9uvYs cD1vlXCDpyp0ZrjX/LFYKcxAVW+5fpDpSruTGft8Jx58oIgCGD3p4qLXm8sxVnwlo1 nVquCm5u4ahovwevwNGgpObcqXKhZLbCIB6LA+o0= Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by sourceware.org (Postfix) with ESMTPS id 5760E386F038 for ; Wed, 26 Aug 2020 13:55:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5760E386F038 Received: by mail-qk1-x742.google.com with SMTP id u3so1865947qkd.9 for ; Wed, 26 Aug 2020 06:55:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:references:from:autocrypt:subject:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=RJUy9TrFLc4qKPN1XLzCPYpkbfxPb1bO6QaVY6udKj4=; b=qJQCBofkVxypqervdiV627a0yi2gQynn8KF47iz+i97KMWEo6ef+n7nNjPLLBxwPCx Noj0GyUxbu+rvoOvYBanfXE+gwTFxzqO0xeRRmUehA3bMERKxWar3YPHsM1axRu//HWi XhOO50gsiJG9W/dZWakUdfxXEUz4oOfr/uw18jPpd8wECtO9ecJLT1Q2mhd9WSPHBwhw lYuEEJxj5IaPTpr89Oy9vj+zA6haIC6AgtUPTzhjaBwoC38rbi+KCoTuVBWFrSefGLMj e+Axfh96RM7c0wRP+3Ys42CA53EQzLnBMeim8PPXaaSCSqhng2Ymi6Bm2EDAb7ECBOBo j6lw== X-Gm-Message-State: AOAM533Vwj+xpj//dSDZUknGwhrEvClPdFt3Re1qvd1iJs4uD0yoOhfe KLVURW5eUxk6QzPOP2NZQwcu07BP8rQQ6Yr9 X-Google-Smtp-Source: ABdhPJwTBF7SbO1YQZgKrwsrCAIoCwsiwnydJHNouDkQIBp7i4rcpKGVkRRagPiT7ok1ChMcy02n7g== X-Received: by 2002:a37:4d3:: with SMTP id 202mr13440752qke.496.1598450125667; Wed, 26 Aug 2020 06:55:25 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id k185sm1718912qkc.77.2020.08.26.06.55.24 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Aug 2020 06:55:25 -0700 (PDT) To: libc-alpha@sourceware.org References: <20200826115309.778995-1-vmihalko@redhat.com> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= mQINBFcVGkoBEADiQU2x/cBBmAVf5C2d1xgz6zCnlCefbqaflUBw4hB/bEME40QsrVzWZ5Nq 8kxkEczZzAOKkkvv4pRVLlLn/zDtFXhlcvQRJ3yFMGqzBjofucOrmdYkOGo0uCaoJKPT186L NWp53SACXguFJpnw4ODI64ziInzXQs/rUJqrFoVIlrPDmNv/LUv1OVPKz20ETjgfpg8MNwG6 iMizMefCl+RbtXbIEZ3TE/IaDT/jcOirjv96lBKrc/pAL0h/O71Kwbbp43fimW80GhjiaN2y WGByepnkAVP7FyNarhdDpJhoDmUk9yfwNuIuESaCQtfd3vgKKuo6grcKZ8bHy7IXX1XJj2X/ BgRVhVgMHAnDPFIkXtP+SiarkUaLjGzCz7XkUn4XAGDskBNfbizFqYUQCaL2FdbW3DeZqNIa nSzKAZK7Dm9+0VVSRZXP89w71Y7JUV56xL/PlOE+YKKFdEw+gQjQi0e+DZILAtFjJLoCrkEX w4LluMhYX/X8XP6/C3xW0yOZhvHYyn72sV4yJ1uyc/qz3OY32CRy+bwPzAMAkhdwcORA3JPb kPTlimhQqVgvca8m+MQ/JFZ6D+K7QPyvEv7bQ7M+IzFmTkOCwCJ3xqOD6GjX3aphk8Sr0dq3 4Awlf5xFDAG8dn8Uuutb7naGBd/fEv6t8dfkNyzj6yvc4jpVxwARAQABtElBZGhlbWVydmFs IFphbmVsbGEgTmV0dG8gKExpbmFybyBWUE4gS2V5KSA8YWRoZW1lcnZhbC56YW5lbGxhQGxp bmFyby5vcmc+iQI3BBMBCAAhBQJXFRpKAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ EKqx7BSnlIjv0e8P/1YOYoNkvJ+AJcNUaM5a2SA9oAKjSJ/M/EN4Id5Ow41ZJS4lUA0apSXW NjQg3VeVc2RiHab2LIB4MxdJhaWTuzfLkYnBeoy4u6njYcaoSwf3g9dSsvsl3mhtuzm6aXFH /Qsauav77enJh99tI4T+58rp0EuLhDsQbnBic/ukYNv7sQV8dy9KxA54yLnYUFqH6pfH8Lly sTVAMyi5Fg5O5/hVV+Z0Kpr+ZocC1YFJkTsNLAW5EIYSP9ftniqaVsim7MNmodv/zqK0IyDB GLLH1kjhvb5+6ySGlWbMTomt/or/uvMgulz0bRS+LUyOmlfXDdT+t38VPKBBVwFMarNuREU2 69M3a3jdTfScboDd2ck1u7l+QbaGoHZQ8ZNUrzgObltjohiIsazqkgYDQzXIMrD9H19E+8fw kCNUlXxjEgH/Kg8DlpoYJXSJCX0fjMWfXywL6ZXc2xyG/hbl5hvsLNmqDpLpc1CfKcA0BkK+ k8R57fr91mTCppSwwKJYO9T+8J+o4ho/CJnK/jBy1pWKMYJPvvrpdBCWq3MfzVpXYdahRKHI ypk8m4QlRlbOXWJ3TDd/SKNfSSrWgwRSg7XCjSlR7PNzNFXTULLB34sZhjrN6Q8NQZsZnMNs TX8nlGOVrKolnQPjKCLwCyu8PhllU8OwbSMKskcD1PSkG6h3r0AquQINBFcVGkoBEACgAdbR Ck+fsfOVwT8zowMiL3l9a2DP3Eeak23ifdZG+8Avb/SImpv0UMSbRfnw/N81IWwlbjkjbGTu oT37iZHLRwYUFmA8fZX0wNDNKQUUTjN6XalJmvhdz9l71H3WnE0wneEM5ahu5V1L1utUWTyh VUwzX1lwJeV3vyrNgI1kYOaeuNVvq7npNR6t6XxEpqPsNc6O77I12XELic2+36YibyqlTJIQ V1SZEbIy26AbC2zH9WqaKyGyQnr/IPbTJ2Lv0dM3RaXoVf+CeK7gB2B+w1hZummD21c1Laua +VIMPCUQ+EM8W9EtX+0iJXxI+wsztLT6vltQcm+5Q7tY+HFUucizJkAOAz98YFucwKefbkTp eKvCfCwiM1bGatZEFFKIlvJ2QNMQNiUrqJBlW9nZp/k7pbG3oStOjvawD9ZbP9e0fnlWJIsj 6c7pX354Yi7kxIk/6gREidHLLqEb/otuwt1aoMPg97iUgDV5mlNef77lWE8vxmlY0FBWIXuZ yv0XYxf1WF6dRizwFFbxvUZzIJp3spAao7jLsQj1DbD2s5+S1BW09A0mI/1DjB6EhNN+4bDB SJCOv/ReK3tFJXuj/HbyDrOdoMt8aIFbe7YFLEExHpSk+HgN05Lg5TyTro8oW7TSMTk+8a5M kzaH4UGXTTBDP/g5cfL3RFPl79ubXwARAQABiQIfBBgBCAAJBQJXFRpKAhsMAAoJEKqx7BSn lIjvI/8P/jg0jl4Tbvg3B5kT6PxJOXHYu9OoyaHLcay6Cd+ZrOd1VQQCbOcgLFbf4Yr+rE9l mYsY67AUgq2QKmVVbn9pjvGsEaz8UmfDnz5epUhDxC6yRRvY4hreMXZhPZ1pbMa6A0a/WOSt AgFj5V6Z4dXGTM/lNManr0HjXxbUYv2WfbNt3/07Db9T+GZkpUotC6iknsTA4rJi6u2ls0W9 1UIvW4o01vb4nZRCj4rni0g6eWoQCGoVDk/xFfy7ZliR5B+3Z3EWRJcQskip/QAHjbLa3pml xAZ484fVxgeESOoaeC9TiBIp0NfH8akWOI0HpBCiBD5xaCTvR7ujUWMvhsX2n881r/hNlR9g fcE6q00qHSPAEgGr1bnFv74/1vbKtjeXLCcRKk3Ulw0bY1OoDxWQr86T2fZGJ/HIZuVVBf3+ gaYJF92GXFynHnea14nFFuFgOni0Mi1zDxYH/8yGGBXvo14KWd8JOW0NJPaCDFJkdS5hu0VY 7vJwKcyHJGxsCLU+Et0mryX8qZwqibJIzu7kUJQdQDljbRPDFd/xmGUFCQiQAncSilYOcxNU EMVCXPAQTteqkvA+gNqSaK1NM9tY0eQ4iJpo+aoX8HAcn4sZzt2pfUB9vQMTBJ2d4+m/qO6+ cFTAceXmIoFsN8+gFN3i8Is3u12u8xGudcBPvpoy4OoG Subject: Re: [PATCH v2] ld.so: add an --argv0 option Message-ID: Date: Wed, 26 Aug 2020 10:55:22 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200826115309.778995-1-vmihalko@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit 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: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On 26/08/2020 08:53, vmihalko--- via Libc-alpha wrote: > From: Vincent Mihalkovic The testcase still misses some pieces (copyright headers, indentation, libsupport usage). > > --- > elf/Makefile | 13 +++++++++++-- > elf/argv0test.c | 18 ++++++++++++++++++ > elf/rtld.c | 17 ++++++++++++++++- > elf/tst-rtld-argv0.sh | 37 +++++++++++++++++++++++++++++++++++++ > 4 files changed, 82 insertions(+), 3 deletions(-) > create mode 100644 elf/argv0test.c > create mode 100755 elf/tst-rtld-argv0.sh > > diff --git a/elf/Makefile b/elf/Makefile > index 0b787218..f38904d8 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 00000000..137ced8d > --- /dev/null > +++ b/elf/argv0test.c > @@ -0,0 +1,18 @@ It misses the GPL copyright header. > +#include // for printf > +#include // for strcmp Afaik the style prefer C-style comments over C++ one, even though they are added on C99. > + > +static int > +do_test (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; > + > +} > + > + > +#define TEST_FUNCTION_ARGV do_test > +#include The indentation it still off, it should be use double space not four space. Also a simple implementation using libsupport would be: #include static int do_test (int argc, char **argv) { TEST_COMPARE_BLOB (argv[0], strlen (argv[0]), "test-argv0", strlen ("test-argv0")); return 0; } #define TEST_FUNCTION_ARGV do_test #include > diff --git a/elf/rtld.c b/elf/rtld.c > index 5b882163..e66e033c 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,10 @@ 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 00000000..5f873b6c > --- /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 > +# . > + > +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 >