mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

Fix a race condition in zf_mkdir -p

Browse source 
If ~/foo does not exist and `zf_mkdir -p zf_mkdir -p` is executed
concurrently in multiple shells, it was possible prior to this patch
for the command to fail with EEXIST.
This commit is contained in:
Roman Perepelitsa 2020-10-23 11:42:30 +02:00
parent da534770fd
commit ead29c2a36
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2020-10-18 Roman Perepelitsa <roman.perepelitsa@gmail.com>
* 47476: Src/Modules/files.c: Fix a race condition in zf_mkdir -p
(based on the patch by Matthew Martin in workers/47436)
2020-10-18 Axel Beckert <abe@deuxchevaux.org> 2020-10-18 Axel Beckert <abe@deuxchevaux.org>
* 47468: Doc/Zsh/contrib.yo: Fix typo * 47468: Doc/Zsh/contrib.yo: Fix typo

28
Src/Modules/files.c
View file

@ -122,19 +122,29 @@ domkdir(char *nam, char *path, mode_t mode, int p)
{ {
int err; int err;
mode_t oumask; mode_t oumask;
struct stat st;
int n = 8;
char const *rpath = unmeta(path); char const *rpath = unmeta(path);
if(p) { while(n-- > 0) {
struct stat st; oumask = umask(0);
err = mkdir(rpath, mode) ? errno : 0;
if(!stat(rpath, &st) && S_ISDIR(st.st_mode)) umask(oumask);
if (!err)
return 0; return 0;
if(!p || err != EEXIST)
break;
if(stat(rpath, &st)) {
if(errno == ENOENT)
continue;
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); zwarnnam(nam, "cannot make directory `%s': %e", path, err);
return 1; return 1;
} }