From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from crocodile.elm.relay.mailchannels.net (crocodile.elm.relay.mailchannels.net [23.83.212.45]) by sourceware.org (Postfix) with ESMTPS id A62113858415 for ; Wed, 6 Oct 2021 16:57:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A62113858415 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 C9D8B922E34; Wed, 6 Oct 2021 16:57:37 +0000 (UTC) Received: from pdx1-sub0-mail-a65.g.dreamhost.com (100-96-18-141.trex.outbound.svc.cluster.local [100.96.18.141]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 50EE2922C00; Wed, 6 Oct 2021 16:57:37 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a65.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.18.141 (trex/6.4.3); Wed, 06 Oct 2021 16:57:37 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Befitting-Shelf: 5a554f7858acf2bb_1633539457548_2864941631 X-MC-Loop-Signature: 1633539457548:379448707 X-MC-Ingress-Time: 1633539457548 Received: from pdx1-sub0-mail-a65.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a65.g.dreamhost.com (Postfix) with ESMTP id 0A7F97FAA3; Wed, 6 Oct 2021 09:57:37 -0700 (PDT) Received: from rhbox.redhat.com (unknown [1.186.223.41]) (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-a65.g.dreamhost.com (Postfix) with ESMTPSA id 4AF297FA80; Wed, 6 Oct 2021 09:57:33 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a65 From: Siddhesh Poyarekar To: libc-stable@sourceware.org Subject: [COMMITTED 2.34] support: Also return fd when it is 0 Date: Wed, 6 Oct 2021 22:27:25 +0530 Message-Id: <20211006165725.88556-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3493.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_NUMSUBJECT, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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, 06 Oct 2021 16:57:42 -0000 The fd validity check in open_dev_null checks if fd > 0, which would lead to a leaked fd if it is =3D=3D 0. Signed-off-by: Siddhesh Poyarekar Reviewed-by: Adhemerval Zanella (cherry picked from commit 27b6edbb090f736b101f569620d8ad0e7217ddf8) --- support/support-open-dev-null-range.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/support/support-open-dev-null-range.c b/support/support-open= -dev-null-range.c index 80d9dba504..66a8504105 100644 --- a/support/support-open-dev-null-range.c +++ b/support/support-open-dev-null-range.c @@ -40,16 +40,16 @@ increase_nofile (void) static int open_dev_null (int flags, mode_t mode) { - int fd =3D open64 ("/dev/null", flags, mode); - if (fd > 0) - return fd; + int fd =3D open64 ("/dev/null", flags, mode); + if (fd >=3D 0) + return fd; =20 - if (fd < 0 && errno !=3D EMFILE) - FAIL_EXIT1 ("open64 (\"/dev/null\", 0x%x, 0%o): %m", flags, mode); + if (fd < 0 && errno !=3D EMFILE) + FAIL_EXIT1 ("open64 (\"/dev/null\", 0x%x, 0%o): %m", flags, mode); =20 - increase_nofile (); + increase_nofile (); =20 - return xopen ("/dev/null", flags, mode); + return xopen ("/dev/null", flags, mode); } =20 struct range --=20 2.31.1