From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RDNS_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: (qmail 22142 invoked from network); 29 Mar 2020 00:31:23 -0000 Received-SPF: pass (mother.openwall.net: domain of lists.openwall.com designates 195.42.179.200 as permitted sender) receiver=inbox.vuxu.org; client-ip=195.42.179.200 envelope-from= Received: from unknown (HELO mother.openwall.net) (195.42.179.200) by inbox.vuxu.org with ESMTP; 29 Mar 2020 00:31:23 -0000 Received: (qmail 16132 invoked by uid 550); 29 Mar 2020 00:31:21 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 9647 invoked from network); 29 Mar 2020 00:20:06 -0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=rcombs.me; q=dns/txt; s=mx; t=1585441208; h=Message-Id: Date: Subject: To: From: Sender; bh=BlTmr99liC69CoXrCZjhSRMbtXI9cBrP97O/hvevf10=; b=hHGNgGr6Fn/hj0locbrSg2oYFBNnnB1nUeaYImTqc/o0jcNuu1Q6/nNRWLEIhFT95o+JgK9w yKJGcb6s21le4SZuspWHrLSYlaMzhi5w2Q0l1Ia5+OJfQFkCLL9vIjWcLzBDPkkanwt0nleV 809J7fedsKMD6koiq0IXUCGMnmc= X-Mailgun-Sending-Ip: 198.61.254.54 X-Mailgun-Sid: WyI4ZjMyMiIsICJtdXNsQGxpc3RzLm9wZW53YWxsLmNvbSIsICJiMGJhIl0= Sender: rcombs@rcombs.me From: rcombs To: musl@lists.openwall.com Date: Sat, 28 Mar 2020 19:19:25 -0500 Message-Id: <1585441168-23444-1-git-send-email-rcombs@rcombs.me> X-Mailer: git-send-email 2.7.4 Subject: [musl] [PATCH 1/4] ldso: add option to rewrite the argv block --- ldso/dynlink.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ldso/dynlink.c b/ldso/dynlink.c index 6468f20..c378f00 100644 --- a/ldso/dynlink.c +++ b/ldso/dynlink.c @@ -1698,6 +1698,7 @@ void __dls3(size_t *sp, size_t *auxv) char **argv = (void *)(sp+1); char **argv_orig = argv; char **envp = argv+argc+1; + int replace_argv = 0; /* Find aux vector just past environ[] and use it to initialize * global data that may be needed before we can make syscalls. */ @@ -1771,6 +1772,8 @@ void __dls3(size_t *sp, size_t *auxv) if (opt[5]=='=') replace_argv0 = opt+6; else if (opt[5]) *argv = 0; else if (*argv) replace_argv0 = *argv++; + } else if (!memcmp(opt, "replace-argv", 12)) { + replace_argv = 1; } else { argv[0] = 0; } @@ -1949,6 +1952,22 @@ void __dls3(size_t *sp, size_t *auxv) debug.state = 0; _dl_debug_state(); + if (replace_argv) { + char *argv_end = argv_orig[0]; + char *orig_ptr = argv_orig[0]; + int i; + for (i = 0; i < (int)(argc - (argv-argv_orig)); i++) { + char *src = (i == 0 && replace_argv0) ? replace_argv0 : argv[i]; + int len = strlen(src) + 1; + memmove(orig_ptr, src, len); + argv_end = argv[i] + strlen(argv[i]); + argv[i] = orig_ptr; + orig_ptr += len; + } + for (; orig_ptr < argv_end; orig_ptr++) + *orig_ptr = 0; + } + if (replace_argv0) argv[0] = replace_argv0; errno = 0; -- 2.7.4