1a8b3bd277
- Fix unexpected inconsistency when making directory, bsc#1203600 * tar-avoid-overflow-in-symlinks-tests.patch * tar-fix-extract-unlink.patch - Update race condition fix, bsc#1200657 * tar-fix-race-condition.patch - Refresh bsc1200657.patch OBS-URL: https://build.opensuse.org/request/show/1031561 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=116
72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
From 79d1ac38c19faad64f0e993180bf1ad27f217072 Mon Sep 17 00:00:00 2001
|
|
From: James Abbatiello <abbeyj@gmail.com>
|
|
Date: Fri, 10 Jun 2022 18:25:13 -0700
|
|
Subject: tar: fix race condition
|
|
|
|
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
|
|
---
|
|
src/extract.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/extract.c b/src/extract.c
|
|
index 0753dec..fda4617 100644
|
|
--- a/src/extract.c
|
|
+++ b/src/extract.c
|
|
@@ -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,
|
|
create all required directories. Return zero if all the required
|
|
- directories were created, nonzero (issuing a diagnostic) otherwise.
|
|
- Set *INTERDIR_MADE if at least one directory was created. */
|
|
+ directories were created, nonzero (issuing a diagnostic) otherwise. */
|
|
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 *cursor; /* points into the file name */
|
|
@@ -685,7 +684,6 @@ make_directories (char *file_name, bool *interdir_made)
|
|
desired_mode, AT_SYMLINK_NOFOLLOW);
|
|
|
|
print_for_mkdir (file_name, cursor - file_name, desired_mode);
|
|
- *interdir_made = true;
|
|
parent_end = NULL;
|
|
}
|
|
else
|
|
@@ -841,8 +839,11 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made)
|
|
|
|
case ENOENT:
|
|
/* Attempt creating missing intermediate directories. */
|
|
- if (make_directories (file_name, interdir_made) == 0)
|
|
- return RECOVER_OK;
|
|
+ if (make_directories (file_name) == 0)
|
|
+ {
|
|
+ *interdir_made = true;
|
|
+ return RECOVER_OK;
|
|
+ }
|
|
break;
|
|
|
|
default:
|
|
@@ -1944,12 +1945,11 @@ rename_directory (char *src, char *dst)
|
|
else
|
|
{
|
|
int e = errno;
|
|
- bool interdir_made;
|
|
|
|
switch (e)
|
|
{
|
|
case ENOENT:
|
|
- if (make_directories (dst, &interdir_made) == 0)
|
|
+ if (make_directories (dst) == 0)
|
|
{
|
|
if (renameat (chdir_fd, src, chdir_fd, dst) == 0)
|
|
return true;
|
|
--
|
|
cgit v1.1
|
|
|