From nobody Tue Apr 30 00:55:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VT1vD2hdLz5HkrZ; Tue, 30 Apr 2024 00:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VT1vD1sCpz4QRX; Tue, 30 Apr 2024 00:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Al9suI4tA4kYSM+4hvOIohsP/uoeSvftmsSwrEdx/Fc=; b=fuQ03mT7AFJwGgEWE/v6NX0VsTmyH8SZV/cKRoZAvKn/ZGEU1N6XLh/omvSqscEIV31KGa nmzQCUfQLITp4dmzMTCpQ5dmMVNXrLDwG9t4Lx/CupI/MVWciBvlkmznkBsLZDzz8vpTgL 6CIySSS8AFjQOQA722Yw6cSchwG0joOLlkQ1+76YVvhnZYlD9cxKE0baYj1VxslfJok6Zn BQtQELakyhdrbWZb9mUQS0mKPcofFQ9phpcklUxci17nR5hbjJyWij8RaJTey6/1moIHbz o9KcC0laNqT5m7xeHZHv/5OMif7DLLNR+Ok+5ad6ogIOYwcdTUahQqL5JuWqWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438504; a=rsa-sha256; cv=none; b=VsRr2UMtAdKS87VmNuPkTUTFgTX/t+C981y6lvzBVSQIL08GPQFtLyU/17l4C6LNmxGkmS Pkof3e6bkmaRn5bE2RAVJU+alOU3zZIhkCOGr/COhBRhTlo3GR8IduwhCRhH6Ru8qt/zyO F6TJnnUOvqa07xasiebydR6bNgoyGbK1FvH4b+PR0uj3uwbY5z/S4+DOMvr4/4jZRLSHYw TePMf3+OPIOB0g5r1I/qeo980m3KYDon0SqfV6WR1qKGKa3HscqEU77P85Cl5xwIBeMVkF 50hykX+D2bhdWSP2wM6bI2A9ZdUs+nshrxhtSyXNHFQDC2ftrvSaSoA3h+tUTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Al9suI4tA4kYSM+4hvOIohsP/uoeSvftmsSwrEdx/Fc=; b=p99YSFEaPD/vNXmqatvr/SiKHkM4oV+uJLB5un5y9EMUtPlY58PzXyOJLO3UHf9F7w0SLD Z/cGau7JZzAQEWscSs48dyrhyj3cOxl22oT0k/nzaolKUtNRs1mXFDxR+r7v9v+VVQP2BT 3qmBBibIrlXAqHZ5CbgMuoobORD8laiKPOft3D8Isk3Bvl7J0YwRdyI4b3rhn3+q0KbZAn yM3eYNQBQBSbM4B73TXHLtqtxHmQavFS91BIRzp77clqM2ZROAh+wfH7owqZE9Snwqj2G2 spB2RoyI+e7ca7vqlBhUZm/rkxKm0ssxI0bZLRnNM0YeZARP1OeipJBs3ds0Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VT1vD1SGyz1SVR; Tue, 30 Apr 2024 00:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43U0t4fA030784; Tue, 30 Apr 2024 00:55:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0t4BI030781; Tue, 30 Apr 2024 00:55:04 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:55:04 GMT Message-Id: <202404300055.43U0t4BI030781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d1cd0cc32b53 - main - rtld: add direct-exec option -o List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1cd0cc32b53c09e72e33116b94a5b0b9781a183 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d1cd0cc32b53c09e72e33116b94a5b0b9781a183 commit d1cd0cc32b53c09e72e33116b94a5b0b9781a183 Author: Konstantin Belousov AuthorDate: 2024-04-28 03:19:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-30 00:16:05 +0000 rtld: add direct-exec option -o allowing to set any known LD_ parameter for the current rtld invocation, but without polluting the activated' binary environment. In other words, the set parameter is not exported into the environment. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44988 --- libexec/rtld-elf/rtld.1 | 20 +++++++++++++++++++- libexec/rtld-elf/rtld.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index a152dd444bd7..0f1e8f68b10a 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 29, 2023 +.Dd April 28, 2024 .Dt RTLD 1 .Os .Sh NAME @@ -352,6 +352,7 @@ The syntax of the direct invocation is .Op Fl b Ar exe .Op Fl d .Op Fl f Ar fd +.Op Fl o Ar OPT=NAME .Op Fl p .Op Fl u .Op Fl v @@ -387,6 +388,23 @@ If this option is specified, is only used to provide the .Va argv[0] value to the program. +.It Fl o Ar OPT=VALUE +Set the +.Ar OPT +configuration variable to the value +.Ar VALUE . +The possible variable names are listed above as +.Ev LD_ +prefixed environment variables, but here are referenced without the +.Ev LD_ +prefix. +A configuration variable set this way does not leak into +the activated image's environment. +.Pp +The option can be repeated as many times as needed to set +all configuration parameters. +The parameters set using this option have priority over +the same parameters assigned via environment. .It Fl p If the .Pa image_path diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index a46cbe4e59c8..f5a2eeb37f10 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -6157,6 +6157,35 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, *fdp = fd; seen_f = true; break; + } else if (opt == 'o') { + struct ld_env_var_desc *l; + char *n, *v; + u_int ll; + + if (j != arglen - 1) { + _rtld_error("Invalid options: %s", arg); + rtld_die(); + } + i++; + n = argv[i]; + v = strchr(n, '='); + if (v == NULL) { + _rtld_error("No '=' in -o parameter"); + rtld_die(); + } + for (ll = 0; ll < nitems(ld_env_vars); ll++) { + l = &ld_env_vars[ll]; + if (v - n == (ptrdiff_t)strlen(l->n) && + strncmp(n, l->n, v - n) == 0) { + l->val = v + 1; + break; + } + } + if (ll == nitems(ld_env_vars)) { + _rtld_error("Unknown LD_ option %s", + n); + rtld_die(); + } } else if (opt == 'p') { *use_pathp = true; } else if (opt == 'u') { @@ -6240,6 +6269,7 @@ print_usage(const char *argv0) " -b Execute instead of , arg0 is \n" " -d Ignore lack of exec permissions for the binary\n" " -f Execute instead of searching for \n" + " -o = Set LD_ to , without polluting env\n" " -p Search in PATH for named binary\n" " -u Ignore LD_ environment variables\n" " -v Display identification information\n"