From nobody Sun Apr 16 11:12:03 2023 X-Original-To: dev-commits-src-branches@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 4PznZW4vZtz458Pq; Sun, 16 Apr 2023 11:12:03 +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 4PznZW3DtFz44Hk; Sun, 16 Apr 2023 11:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643523; 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=aUHd7UHbKTWSLNL7nYtN94UgOFXbhKfuCEJ2A1JllGc=; b=Qd1AqpI9/AWfp4IQIPVGjjd1Sq9tVDJ5pKo+PodBYNIgZGE+UYYaw4yFc1h4UJXWqC9JPJ 4CiBZmcksa/JgUGoB/GoBSy5DijDMvTBLLwZKglF5JPj1NbI9kqlnGlompDKfKML72VaPm 7ZQlKYtfNZvVH6yrEc5VnyJ3LCWsbjYSwdcmfBDapvXlGl+EaWwr6HGB/F89US+CP+NXMX vjTP4vi9wOJSsrKcT0iTsS5hXzlLkjSM/SxzLYc/Wq18lXrUVv7yVGgUC/iMb+sjpN/SgB +3XD00hTXZN7gm1ThrOhU9nJFd/VCTpNDBcDM9avtk/QaePnn7ivEB+CoW5Ziw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643523; 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=aUHd7UHbKTWSLNL7nYtN94UgOFXbhKfuCEJ2A1JllGc=; b=i/Y8yQRVDC4T5FVlv2zcrB1ov27Tmb0t/X1zQTUxOreTwUdA3kvghBougz1CwHu8XPcrHV ZomnPNL6qlNpVaM+khuzqK2gpBXnwkeWO5Vtq2Nfqhu2tdDx7ZO5LwpMF91YKBFcTXLeGo EB3lWfc2s8S0tMYoCD911DJ6hRlkK/8XKTUWrjfVO2JgkYnTWvp7Zh+DOnk4F6PjrVRSkK UTbbrpM7LcBBT+FQXSFGjdpzztQruKxKLbPGWKHibglEMcx/zgpyMC68amMW03fqmmI8qv 5q7YaPhYo95O4E+PCaCvHI/6vDGLSqBtzJX9krZlTu00Nlz3142HysH+tHFYJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643523; a=rsa-sha256; cv=none; b=Et32I+pYNCIrzuWj+yvB9uyG13exjwwVuXVJaJzDR1dt/sOm4UEK+7yyxwjQyGAoi/Wp12 VNYCwj+o5SSAn75oqWwuq9jiODNwBKEdX3qGeEz5obOLhfkLJtiMPuUuzILuENw/YyT4tO dl3HJM0rNWdQtNmKL9VeVYujgQufxCtkPo9HZKz77soUTnHP6DXFnngiwAoP+RIBWu7piH RbRtGu53l3psCUBwADrc0Hk+Zv3HgM0IvXSb55xKa1NeBJ9OjSM7Csn287HEF/1sAmzvXF 0rpNRNky72t3NEvVo28YI7xVSEV5cg95fcWPlhvPa2WNCc45/uy2BW0yD/dd2g== 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 4PznZW2LsGzlqx; Sun, 16 Apr 2023 11:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBC3Z1054558; Sun, 16 Apr 2023 11:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBC3Em054557; Sun, 16 Apr 2023 11:12:03 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:12:03 GMT Message-Id: <202304161112.33GBC3Em054557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c38df24407d1 - stable/13 - rtld: fixes for handling of the grouped options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c38df24407d1fcafb0c805db919315136a93c95a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c38df24407d1fcafb0c805db919315136a93c95a commit c38df24407d1fcafb0c805db919315136a93c95a Author: Konstantin Belousov AuthorDate: 2023-04-13 04:47:23 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 11:11:35 +0000 rtld: fixes for handling of the grouped options (cherry picked from commit 7cdfe51f30965a365e3e7c829396a56e2a7e5141) --- libexec/rtld-elf/rtld.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 8e2cd0dfcb24..30cb4b595b71 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -6078,13 +6078,16 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, _rtld_error("Both -b and -f specified"); rtld_die(); } + if (j != arglen - 1) { + _rtld_error("Invalid options: %s", arg); + rtld_die(); + } i++; *argv0 = argv[i]; seen_b = true; break; } else if (opt == 'd') { *dir_ignore = true; - break; } else if (opt == 'f') { if (seen_b) { _rtld_error("Both -b and -f specified"); @@ -6099,7 +6102,8 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, * name but the descriptor is what * will actually be executed). * - * -f must be the last option in, e.g., -abcf. + * -f must be the last option in the + * group, e.g., -abcf . */ if (j != arglen - 1) { _rtld_error("Invalid options: %s", arg);