From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dragonfly.birch.relay.mailchannels.net (dragonfly.birch.relay.mailchannels.net [23.83.209.51]) by sourceware.org (Postfix) with ESMTPS id E2A0C393CC07 for ; Wed, 4 Aug 2021 10:27:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E2A0C393CC07 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 5F59E34212D; Wed, 4 Aug 2021 10:27:43 +0000 (UTC) Received: from pdx1-sub0-mail-a4.g.dreamhost.com (100-96-18-112.trex-nlb.outbound.svc.cluster.local [100.96.18.112]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id C31DF34217B; Wed, 4 Aug 2021 10:27:42 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a4.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.18.112 (trex/6.3.3); Wed, 04 Aug 2021 10:27:43 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Fearful-Invention: 724d50254e57c94e_1628072863203_4206112141 X-MC-Loop-Signature: 1628072863202:3773519691 X-MC-Ingress-Time: 1628072863202 Received: from pdx1-sub0-mail-a4.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a4.g.dreamhost.com (Postfix) with ESMTP id 8CE7D8AAB3; Wed, 4 Aug 2021 03:27:42 -0700 (PDT) Received: from rhbox.redhat.com (unknown [1.186.101.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a4.g.dreamhost.com (Postfix) with ESMTPSA id 3C44F8AAAB; Wed, 4 Aug 2021 03:27:39 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a4 From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: Arjun Shankar Subject: [committed 2.34 4/5] copy_and_spawn_sgid: Avoid double calls to close() Date: Wed, 4 Aug 2021 15:57:21 +0530 Message-Id: <20210804102722.3103199-4-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210804102722.3103199-1-siddhesh@sourceware.org> References: <20210804102722.3103199-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3494.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 10:27:46 -0000 If close() on infd and outfd succeeded, reset the fd numbers so that we don't attempt to close them again. Reviewed-by: Arjun Shankar (cherry picked from commit 45caed9d67a00af917d8b5b88d4b5eb1225b7aef) --- support/support_capture_subprocess.c | 1 + 1 file changed, 1 insertion(+) diff --git a/support/support_capture_subprocess.c b/support/support_captu= re_subprocess.c index 27bfd19c93..0bacf6dbc2 100644 --- a/support/support_capture_subprocess.c +++ b/support/support_capture_subprocess.c @@ -170,6 +170,7 @@ copy_and_spawn_sgid (char *child_id, gid_t gid) support_subprogram because we only want the program exit status, no= t the contents. */ ret =3D 0; + infd =3D outfd =3D -1; =20 char * const args[] =3D {execname, child_id, NULL}; =20 --=20 2.31.1