[PATCH v2 2/3] object-file: don't special-case missing source file in collision check
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jan 6, 2025, 09:24 UTC
- Message-ID
- <20250106-b4-pks-object-file-racy-collision-check-v2-2-8b3984ecbb18@pks.im>
- In-Reply-To
- <20250106-b4-pks-object-file-racy-collision-check-v2-0-8b3984ecbb18@pks.im>
In 0ad3d65652 (object-file: fix race in object collision check, 2024-12-30) we have started to ignore ENOENT when opening either the source or destination file of the collision check. This was done to handle races more gracefully in case either of the potentially-colliding disappears.
The fix is overly broad though: while the destination file may indeed vanish racily, this shouldn't ever happen for the source file, which is a temporary object file (either loose or in packfile format) that we have just created. So if any concurrent process would have removed that temporary file it would indicate an actual issue.
Stop treating ENOENT specially for the source file so that we always bubble up this error.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- object-file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/object-file.c b/object-file.c index e1989236ca87e565dea4d003f57882f257889ecf..acfda5e303659195109c94f5b54b8a081fe92c59 100644 --- a/object-file.c +++ b/object-file.c @@ -1978,8 +1978,7 @@ static int check_collision(const char *source, const char *dest) fd_source = open(source, O_RDONLY); if (fd_source < 0) { - if (errno != ENOENT) - ret = error_errno(_("unable to open %s"), source); + ret = error_errno(_("unable to open %s"), source); goto out; }
-- 2.48.0.rc1.245.gb3e6e7acbc.dirty