From: Matthew Martin <phy1729@gmail.com>
To: zsh-workers@zsh.org
Subject: Re: [patch] Avoid race in zf_mkdir
Date: Fri, 9 Oct 2020 16:40:18 -0500 [thread overview]
Message-ID: <20201009214018.GB6449@CptOrmolo.darkstar> (raw)
In-Reply-To: <CAN=4vMqJ8SXkz_EVqwL7-9gCQYg9GMczOztAtsErirXGEDRq8Q@mail.gmail.com>
On Fri, Oct 09, 2020 at 11:22:00PM +0200, Roman Perepelitsa wrote:
> Perhaps something like this? This should provide the following
> guarantees for zf_mkdir -p:
>
> - If it succeeds, the directory must have existed at some point during
> the execution of the function (either created by zf_mkdir itself or by
> some other concurrent process).
> - If it fails, there must have been a point in time during the
> execution of the function where the target directory or one of its
> parents didn't exist and it was impossible to create it.
>
> `zf_mkdir -p foo` It should work as expected in the face of concurrent
> `mkdir foo && rmdir foo` or `touch foo && rm foo`.
>
> I confess that I haven't tested it.
>
> Roman.
> diff --git a/Src/Modules/files.c b/Src/Modules/files.c
> index 6d20e38a8..a9ccccb8b 100644
> --- a/Src/Modules/files.c
> +++ b/Src/Modules/files.c
> @@ -122,19 +122,28 @@ domkdir(char *nam, char *path, mode_t mode, int p)
> {
> int err;
> mode_t oumask;
> + struct stat st;
> char const *rpath = unmeta(path);
>
> - if(p) {
> - struct stat st;
> -
> - if(!stat(rpath, &st) && S_ISDIR(st.st_mode))
> + while(1) {
> + oumask = umask(0);
> + err = mkdir(rpath, mode) ? errno : 0;
> + umask(oumask);
> + if (!err)
> + return 0;
> + if(!p || err != EEXIST)
> + break;
> + if(!stat(rpath, &st)) {
> + if(errno == ENOENT)
> + continue;
For a sufficiently well timed attacker, the target could be created and
deleted so that this loop never exits. Even if pathological, I don't
think it should be possible for mkdir to loop forever.
> + err = errno;
> + break;
> + }
> + if(S_ISDIR(st.st_mode))
> return 0;
> + break;
> }
> - oumask = umask(0);
> - err = mkdir(rpath, mode) ? errno : 0;
> - umask(oumask);
> - if(!err)
> - return 0;
> +
> zwarnnam(nam, "cannot make directory `%s': %e", path, err);
> return 1;
> }
prev parent reply other threads:[~2020-10-09 21:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 20:07 Matthew Martin
2020-10-09 20:24 ` Bart Schaefer
2020-10-09 20:35 ` Roman Perepelitsa
2020-10-09 20:47 ` Bart Schaefer
2020-10-09 20:53 ` Matthew Martin
2020-10-09 21:22 ` Roman Perepelitsa
2020-10-09 21:27 ` Bart Schaefer
2020-10-10 11:50 ` Roman Perepelitsa
2020-10-15 10:01 ` Roman Perepelitsa
2020-10-15 15:29 ` Bart Schaefer
2020-10-15 15:36 ` Roman Perepelitsa
2020-10-15 16:47 ` Bart Schaefer
2020-10-22 13:30 ` Roman Perepelitsa
2020-10-09 21:40 ` Matthew Martin [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201009214018.GB6449@CptOrmolo.darkstar \
--to=phy1729@gmail.com \
--cc=zsh-workers@zsh.org \
/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://git.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).