From: Eric Sunshine <sunshine@sunshineco.com>
To: Michal Suchanek <msuchanek@suse.de>
Cc: "Git List" <git@vger.kernel.org>,
"Marketa Calabkova" <mcalabkova@suse.cz>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH v3 1/2] worktree: fix worktree add race.
Date: Wed, 20 Feb 2019 11:34:54 -0500 [thread overview]
Message-ID: <CAPig+cSdA8XRwCJQD3o6DZLwesBLRTys7OV6u0wy9Ve3Hp6XPA@mail.gmail.com> (raw)
In-Reply-To: <e134801d570d0a0c85424eb80b41893f4d8383ca.1550679076.git.msuchanek@suse.de>
On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek <msuchanek@suse.de> wrote:
> Git runs a stat loop to find a worktree name that's available and then does
> mkdir on the found name. Turn it to mkdir loop to avoid another invocation of
> worktree add finding the same free name and creating the directory first.
>
> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> ---
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> @@ -295,8 +295,12 @@ static int add_worktree(const char *path, const char *refname,
> if (safe_create_leading_directories_const(sb_repo.buf))
> die_errno(_("could not create leading directories of '%s'"),
> sb_repo.buf);
> - while (!stat(sb_repo.buf, &st)) {
> + while (mkdir(sb_repo.buf, 0777)) {
> counter++;
> + if ((errno != EEXIST) || !counter /* overflow */)
> + die_errno(_("could not create directory of '%s'"),
> + sb_repo.buf);
> strbuf_setlen(&sb_repo, len);
> strbuf_addf(&sb_repo, "%d", counter);
> }
> @@ -306,8 +310,6 @@ static int add_worktree(const char *path, const char *refname,
> atexit(remove_junk);
> sigchain_push_common(remove_junk_on_signal);
> - if (mkdir(sb_repo.buf, 0777))
> - die_errno(_("could not create directory of '%s'"), sb_repo.buf);
> junk_git_dir = xstrdup(sb_repo.buf);
> is_junk = 1;
Did you audit this "junk" handling to verify that stuff which ought to
be cleaned up still is cleaned up now that the mkdir() and die() have
been moved above the atexit(remove_junk) invocation?
I did just audit it, and I _think_ that it still works as expected,
but it would be good to hear that someone else has come to the same
conclusion.
next prev parent reply other threads:[~2019-02-20 16:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-18 17:04 [PATCH 0/2] worktree add race fix Michal Suchanek
2019-02-18 17:04 ` [PATCH 1/2] worktree: fix worktree add race Michal Suchanek
2019-02-18 17:04 ` [PATCH 2/2] setup: don't fail if commondir reference is deleted Michal Suchanek
2019-02-18 21:00 ` Eric Sunshine
2019-02-21 10:50 ` Duy Nguyen
2019-02-21 13:50 ` Michal Suchánek
2019-02-21 17:07 ` Phillip Wood
2019-02-21 17:12 ` Eric Sunshine
2019-02-21 17:27 ` Phillip Wood
2019-03-04 13:30 ` Michal Suchánek
2019-02-21 17:33 ` Michal Suchánek
2019-02-22 9:32 ` Duy Nguyen
2019-02-22 10:20 ` Phillip Wood
2019-02-22 9:26 ` Duy Nguyen
2019-02-20 16:16 ` [PATCH v3 1/2] worktree: fix worktree add race Michal Suchanek
2019-02-20 16:34 ` Eric Sunshine [this message]
2019-02-20 17:29 ` Michal Suchánek
2019-03-08 9:20 ` Duy Nguyen
2019-03-08 9:37 ` Eric Sunshine
2019-03-11 1:55 ` Junio C Hamano
2019-02-20 16:16 ` [PATCH v3 2/2] setup: don't fail if commondir reference is deleted Michal Suchanek
2019-02-20 16:55 ` Eric Sunshine
2019-02-20 17:16 ` Michal Suchánek
2019-02-20 18:35 ` Eric Sunshine
2019-02-21 9:27 ` Eric Sunshine
2019-02-21 11:13 ` Michal Suchánek
2019-02-21 11:19 ` Michal Suchánek
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=CAPig+cSdA8XRwCJQD3o6DZLwesBLRTys7OV6u0wy9Ve3Hp6XPA@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mcalabkova@suse.cz \
--cc=msuchanek@suse.de \
--cc=pclouds@gmail.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).