From: Duy Nguyen <pclouds@gmail.com>
To: "Jens Lindström" <jl@opera.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] Clear fd after closing to avoid double-close error
Date: Tue, 22 Oct 2013 19:39:08 +0700 [thread overview]
Message-ID: <CACsJy8DtvaojrrQr4=uYCRse7N+SXb+WdjY+C_0FRSjYsNC6zg@mail.gmail.com> (raw)
In-Reply-To: <1382443823-31317-1-git-send-email-jl@opera.com>
On Tue, Oct 22, 2013 at 7:10 PM, Jens Lindström <jl@opera.com> wrote:
> From: Jens Lindstrom <jl@opera.com>
>
> In send_pack(), clear the fd passed to pack_objects() by setting
> it to -1, since pack_objects() closes the fd (via a call to
> run_command()).
>
> Not doing so risks having git_transport_push(), caller of
> send_pack(), closing the fd again, possibly incorrectly closing
> some other open file.
Not your itch. But if you have time you may want to fix fetch-pack
too. It has the same problem. fetch-pack.c:get_pack() with
use_sideband == 0 passes fd[0] to start_command(), then later its
caller transport.c:fetch_refs_via_pack() closes the handle again.
> Signed-off-by: Jens Lindström <jl@opera.com>
> ---
> send-pack.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/send-pack.c b/send-pack.c
> index 7d172ef..7def2af 100644
> --- a/send-pack.c
> +++ b/send-pack.c
> @@ -302,6 +302,9 @@ int send_pack(struct send_pack_args *args,
> finish_async(&demux);
> return -1;
In this code block, there is "close(out);", we may need to set fd[1] = -1 too.
> }
> + if (!args->stateless_rpc)
> + /* Closed by pack_objects() via start_command() */
> + fd[1] = -1;
> }
> if (args->stateless_rpc && cmds_sent)
> packet_flush(out);
I was puzzled by this packet_flush(out) for a while because I thought
"out" was already closed. Turns out when stateless_rpc is true, a new
pipe is created in pack_objects() and "out" is not closed. So
everything is still good (and messy).
Life would have been simpler if fd[1] was _always_ closed by
send_pack(), like in c20181e (start_command(), if .in/.out > 0, closes
file descriptors, not the callers - 2008-02-21).
--
Duy
next prev parent reply other threads:[~2013-10-22 12:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 12:10 [PATCH] Clear fd after closing to avoid double-close error Jens Lindström
2013-10-22 12:39 ` Duy Nguyen [this message]
2013-10-22 13:15 ` Jens Lindström
2013-10-22 18:42 ` Junio C Hamano
2013-10-23 7:52 ` Jens Lindström
2013-10-23 16:06 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACsJy8DtvaojrrQr4=uYCRse7N+SXb+WdjY+C_0FRSjYsNC6zg@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=jl@opera.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).