From patchwork Wed May 12 04:47:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 1477405 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=iaF4EnMV; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fg2Ms0S1Nz9sW5 for ; Wed, 12 May 2021 14:47:37 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7BE86384406C; Wed, 12 May 2021 04:47:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7BE86384406C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620794853; bh=p7jjU+tC+CsfUPDbOsZINseBIv616muG/oWPBnVlf5s=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=iaF4EnMV8T0gq5VlFm99vj6qWeaoIadkOS/oUIFrGst7jAo0bHXyFg6MHxRvGl8su kEMy213NoUPXLsyxEKQCpjZ2y7usw3tcjTuXLt/NrgdrX+2J4bn3witd6by7Q190j1 VhSmD0Uq750THWisv9zLfsYRXsjFLbKPMXpq7v74= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from aye.elm.relay.mailchannels.net (aye.elm.relay.mailchannels.net [23.83.212.6]) by sourceware.org (Postfix) with ESMTPS id 7DC59385780B for ; Wed, 12 May 2021 04:47:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7DC59385780B 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 4D8752233A for ; Wed, 12 May 2021 04:47:30 +0000 (UTC) Received: from pdx1-sub0-mail-a35.g.dreamhost.com (100-96-133-96.trex.outbound.svc.cluster.local [100.96.133.96]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id DF07422506 for ; Wed, 12 May 2021 04:47:29 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a35.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.133.96 (trex/6.2.1); Wed, 12 May 2021 04:47:30 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Callous-Juvenile: 30c779201f4849da_1620794850127_2715445398 X-MC-Loop-Signature: 1620794850127:1029448112 X-MC-Ingress-Time: 1620794850127 Received: from pdx1-sub0-mail-a35.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a35.g.dreamhost.com (Postfix) with ESMTP id 99F2786127 for ; Tue, 11 May 2021 21:47:29 -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-a35.g.dreamhost.com (Postfix) with ESMTPSA id 67A817ED2C for ; Tue, 11 May 2021 21:47:27 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a35 To: libc-alpha@sourceware.org Subject: [PATCH] support: Close fds in copy_func Date: Wed, 12 May 2021 10:17:06 +0530 Message-Id: <20210512044706.462992-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3494.8 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Siddhesh Poyarekar via Libc-alpha From: Siddhesh Poyarekar Reply-To: Siddhesh Poyarekar Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" copy_func may leave file descriptors open on error, so close them on function exit. Reviewed-by: DJ Delorie --- support/shell-container.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/support/shell-container.c b/support/shell-container.c index b64974086a..b2a4324dc7 100644 --- a/support/shell-container.c +++ b/support/shell-container.c @@ -93,8 +93,9 @@ copy_func (char **argv) { char *sname = argv[0]; char *dname = argv[1]; - int sfd, dfd; + int sfd = -1, dfd = -1; struct stat st; + int ret = 1; sfd = open (sname, O_RDONLY); if (sfd < 0) @@ -108,7 +109,7 @@ copy_func (char **argv) { fprintf (stderr, "cp: unable to fstat %s: %s\n", sname, strerror (errno)); - return 1; + goto out; } dfd = open (dname, O_WRONLY | O_TRUNC | O_CREAT, 0600); @@ -116,22 +117,26 @@ copy_func (char **argv) { fprintf (stderr, "cp: unable to open %s for writing: %s\n", dname, strerror (errno)); - return 1; + goto out; } if (support_copy_file_range (sfd, 0, dfd, 0, st.st_size, 0) != st.st_size) { fprintf (stderr, "cp: cannot copy file %s to %s: %s\n", sname, dname, strerror (errno)); - return 1; + goto out; } - close (sfd); - close (dfd); - + ret = 0; chmod (dname, st.st_mode & 0777); - return 0; +out: + if (sfd >= 0) + close (sfd); + if (dfd >= 0) + close (dfd); + + return ret; }