From patchwork Fri Jul 26 10:33:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Henrik_Lindstr=C3=B6m?= X-Patchwork-Id: 1965254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lxm.se header.i=@lxm.se header.a=rsa-sha256 header.s=loopiadkim1708025221 header.b=y7Xe8cCP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WVkfH32wKz1ybY for ; Fri, 26 Jul 2024 20:35:03 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 89151384A074 for ; Fri, 26 Jul 2024 10:35:01 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp.outgoing.loopia.se (smtp.outgoing.loopia.se [93.188.3.37]) by sourceware.org (Postfix) with ESMTPS id 3BB5C385840E for ; Fri, 26 Jul 2024 10:34:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3BB5C385840E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=lxm.se Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lxm.se ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3BB5C385840E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=93.188.3.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721990082; cv=none; b=BM+Czd2PBRWnfXkmWinPvXURKD6EkC2Zj6mcB1glZOMdJbPU1wF0P2JnnJblNMiDYDyYMOHrx6y2cEGpwrt4RMmBtNLCMHZda1jV7e/lMPKvRf0myLM1lcgGxr65kE9qpz1RPbAmh5VgiUC9NoHRJ9fwTlBkJZm2BICKBhXaB1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721990082; c=relaxed/simple; bh=D0uFmFr1iSKWRhLX6D5P72Go+OxXkQWBdy7ygtr3A7w=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=uiL30Pcbl2JfsWowempO7cLDZKqLGOv6CQpzG3l/RO1r8wp5M88luFyh6fCFNloNIvzVCNe71l8X3YhiUJEhWWEPXGwG26UFjbxsZQN2+TZYYuCknfo9ZlpL/GA9jsExyQzw72tUsBZewsYE2GoVPZNxz2Bq+d8opO4XMJgIcHg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from s807.loopia.se (localhost [127.0.0.1]) by s807.loopia.se (Postfix) with ESMTP id 63ABC2F193 for ; Fri, 26 Jul 2024 12:34:37 +0200 (CEST) Received: from s934.loopia.se (unknown [172.22.191.6]) by s807.loopia.se (Postfix) with ESMTP id 494A02DE65; Fri, 26 Jul 2024 12:34:37 +0200 (CEST) Received: from s472.loopia.se (unknown [172.22.191.5]) by s934.loopia.se (Postfix) with ESMTP id 475F17CEA99; Fri, 26 Jul 2024 12:34:37 +0200 (CEST) X-Virus-Scanned: amavisd-new at amavis.loopia.se X-Spam-Score: -1.2 X-Spam-Level: X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 Authentication-Results: s472.loopia.se (amavisd-new); dkim=pass (2048-bit key) header.d=lxm.se Received: from s934.loopia.se ([172.22.191.6]) by s472.loopia.se (s472.loopia.se [172.22.190.12]) (amavisd-new, port 10024) with LMTP id CdZoOXerdJ_K; Fri, 26 Jul 2024 12:34:36 +0200 (CEST) X-Loopia-Auth: user X-Loopia-User: henrik@lxm.se X-Loopia-Originating-IP: 92.35.23.126 Received: from pc.arpa.home (c-7e17235c.012-196-6c6b701.bbcust.telenor.se [92.35.23.126]) (Authenticated sender: henrik@lxm.se) by s934.loopia.se (Postfix) with ESMTPSA id AC93E7CEA85; Fri, 26 Jul 2024 12:34:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lxm.se; s=loopiadkim1708025221; t=1721990076; bh=pwZ0Zfiowy1CLtEuLz+mcgI1LjmaHWKtOC0YpUaSJCw=; h=From:To:Cc:Subject:Date; b=y7Xe8cCPalxqkWoC7QYAdjx2RnVp/PR59wTN+lrumQ7JlJNnL6ZUv0UdrVdzzmsxY psrem4tmz+aNhKfR9K002ZF3SSkLk03L1wYW0ZDOlLwG1/am9hDoKHH3cThekBLNHY HsHaqibwq52LXNqBo4N7rfjG8PaefoEeF3Ra63uILQ9W5JPP70IpYvbbsPxBNC0NrK V2ObwT+AoGjbl+jHHEMKQYAgYNR8pbu+oz8I3kydPQ45khd+AInEYvGI7OB5aDBUd7 uejYEwff/2boO8QbP62qoLpDPy2HDRUD1ZhCjvAs6EfrQg8BKFM7HCwavAxQCpvMh4 yV+RNkl99dISQ== From: =?utf-8?q?Henrik_Lindstr=C3=B6m?= To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, =?utf-8?q?Henrik_Lindstr=C3=B6m?= Subject: [PATCH v2 1/2] rtld: Fix handling of '--' option Date: Fri, 26 Jul 2024 12:33:50 +0200 Message-Id: <20240726103351.3956251-1-henrik@lxm.se> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org It always resulted in the error `unrecognized option '--'` previously. Reviewed-by: Adhemerval Zanella --- elf/rtld.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index bfdf632e77..7b982c5fe5 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1501,12 +1501,16 @@ dl_main (const ElfW(Phdr) *phdr, _dl_version (); else if (_dl_argv[1][0] == '-' && _dl_argv[1][1] == '-') { - if (_dl_argv[1][1] == '\0') - /* End of option list. */ - break; - else - /* Unrecognized option. */ - _dl_usage (ld_so_name, _dl_argv[1]); + if (_dl_argv[1][2] == '\0') + { + /* End of option list. */ + --_dl_argc; + ++_dl_argv; + break; + } + else + /* Unrecognized option. */ + _dl_usage (ld_so_name, _dl_argv[1]); } else break;