From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 22 Oct 2022 20:21:51 +0000 (-0400)
Subject: Make the same fix for mkdirat
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d4ba3a8357b56264f10275b29bfef04de45af2;p=thirdparty%2Ffreeradius-server.git

Make the same fix for mkdirat
---

diff --git a/src/lib/util/file.c b/src/lib/util/file.c
index e01203c828c..0cd84a787c0 100644
--- a/src/lib/util/file.c
+++ b/src/lib/util/file.c
@@ -124,8 +124,25 @@ static ssize_t _fr_mkdir(int *fd_out, char *start, char *path, mode_t mode, fr_m
 	 *	Dir may already exist if we're racing
 	 *	other processes as we do in CI.
 	 */
-	if ((mkdirat(*fd_out, p + 1, 0700) < 0) && (errno != EEXIST)) {
+	if (mkdirat(*fd_out, p + 1, 0700) < 0) {
+		/*
+		 *	This is usually because of a race with
+		 *	other processes trying to create the
+		 *	same directory.
+		 */
+		if (errno == EEXIST) {
+			fd = openat(*fd_out, p + 1, O_DIRECTORY);
+			if (fd < 0) {
+				fr_strerror_printf_push("Failed opening existing directory path component: %s",
+							fr_syserror(errno));
+				goto mkdirat_error;
+			}
+			*p = FR_DIR_SEP;
+			goto done;
+		}
+
 		fr_strerror_printf_push("Failed creating directory path component: %s", fr_syserror(errno));
+
 	mkdirat_error:
 		close(*fd_out);
 		*fd_out = -1;
@@ -144,6 +161,7 @@ static ssize_t _fr_mkdir(int *fd_out, char *start, char *path, mode_t mode, fr_m
 					"directory we created: %s", fr_syserror(errno));
 		goto mkdirat_error;
 	}
+
 	*p = FR_DIR_SEP;
 
 	/*
@@ -158,6 +176,7 @@ static ssize_t _fr_mkdir(int *fd_out, char *start, char *path, mode_t mode, fr_m
 	 *	Swap active *fd_out to point to the dir
 	 *      we just created.
 	 */
+done:
 	close(*fd_out);
 	*fd_out = fd;