mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tar: fix race condition

Browse Source 
Problem reported in:
https://lists.gnu.org/r/bug-tar/2022-03/msg00000.html
* src/extract.c (make_directories): Retry the file creation as
long as the directory exists, regardless of whether tar itself
created the directory.
Copyright-paperwork-exempt: Yes
This commit is contained in:
James Abbatiello
2022-06-10 18:25:13 -07:00
committed by Paul Eggert
parent 79a442d7b0
commit 79d1ac38c1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/extract.c
View File

@@ -638,10 +638,9 @@ fixup_delayed_set_stat (char const *src, char const *dst)
/* After a file/link/directory creation has failed due to ENOENT, /* After a file/link/directory creation has failed due to ENOENT,
create all required directories. Return zero if all the required create all required directories. Return zero if all the required
directories were created, nonzero (issuing a diagnostic) otherwise. directories were created, nonzero (issuing a diagnostic) otherwise. */
Set *INTERDIR_MADE if at least one directory was created. */
static int static int
make_directories (char *file_name, bool *interdir_made) make_directories (char *file_name)
{ {
char *cursor0 = file_name + FILE_SYSTEM_PREFIX_LEN (file_name); char *cursor0 = file_name + FILE_SYSTEM_PREFIX_LEN (file_name);
char *cursor; /* points into the file name */ char *cursor; /* points into the file name */
@@ -685,7 +684,6 @@ make_directories (char *file_name, bool *interdir_made)
desired_mode, AT_SYMLINK_NOFOLLOW); desired_mode, AT_SYMLINK_NOFOLLOW);
print_for_mkdir (file_name, cursor - file_name, desired_mode); print_for_mkdir (file_name, cursor - file_name, desired_mode);
*interdir_made = true;
parent_end = NULL; parent_end = NULL;
} }
else else
@@ -841,8 +839,11 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made)
case ENOENT: case ENOENT:
/* Attempt creating missing intermediate directories. */ /* Attempt creating missing intermediate directories. */
if (make_directories (file_name, interdir_made) == 0) if (make_directories (file_name) == 0)
{
*interdir_made = true;
return RECOVER_OK; return RECOVER_OK;
}
break; break;
default: default:
@@ -1944,12 +1945,11 @@ rename_directory (char *src, char *dst)
else else
{ {
int e = errno; int e = errno;
bool interdir_made;
switch (e) switch (e)
{ {
case ENOENT: case ENOENT:
if (make_directories (dst, &interdir_made) == 0) if (make_directories (dst) == 0)
{ {
if (renameat (chdir_fd, src, chdir_fd, dst) == 0) if (renameat (chdir_fd, src, chdir_fd, dst) == 0)
return true; return true;