9c026f3 libpkg: Clean up create_dir() a bit — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

libpkg: Clean up create_dir() a bit

Mark Johnston committed 7 months ago

commit 9c026f3f3574e0d0dca4765c215b9ff4a3c2c1b7
parent a31c8c3

1 file changed +24 -9

modified libpkg/pkg_add.c

@@ -432,12 +432,13 @@ close_tempdir(struct tempdir *t)

 }
 static int
 create_dir(struct pkg_add_context *context, struct pkg_dir *d, tempdirs_t *tempdirs)
 create_dir(struct pkg_add_context *context, struct pkg_dir *d,
     tempdirs_t *tempdirs)
 {
 	struct stat st;
 	struct tempdir *tmpdir = NULL;
 	int fd;
 	struct tempdir *tmpdir;
 	const char *path;
 	int error, fd;
 	tmpdir = get_tempdir(context, d->path, tempdirs);
 	if (tmpdir == NULL) {

@@ -448,25 +449,39 @@ create_dir(struct pkg_add_context *context, struct pkg_dir *d, tempdirs_t *tempd

 		path = d->path + tmpdir->len;
 	}
 	if (mkdirat(fd, RELATIVE_PATH(path), 0755) == -1)
 	if (mkdirat(fd, RELATIVE_PATH(path), 0755) == -1) {
 		if (!mkdirat_p(fd, RELATIVE_PATH(path))) {
 			close_tempdir(tmpdir);
 			return (EPKG_FATAL);
 		}
 	}
 	if (fstatat(fd, RELATIVE_PATH(path), &st, 0) == -1) {
 		if (errno != ENOENT) {
 			close_tempdir(tmpdir);
 			pkg_fatal_errno("Fail to stat directory %s", path);
 			pkg_fatal_errno("Fail to stat directory %s", d->path);
 		}
 		if (fstatat(fd, RELATIVE_PATH(path), &st, AT_SYMLINK_NOFOLLOW) == 0) {
 			unlinkat(fd, RELATIVE_PATH(path), 0);
 		/* path is a dangling symlink. */
 		error = unlinkat(fd, RELATIVE_PATH(path), 0);
 		if (error != 0) {
 			close_tempdir(tmpdir);
 			pkg_fatal_errno("Fail to unlink dangling symlink %s",
 			    d->path);
 		}
 		if (mkdirat(fd, RELATIVE_PATH(path), 0755) == -1) {
 			if (tmpdir != NULL) {
 				close_tempdir(tmpdir);
 				pkg_fatal_errno("Fail to create directory '%s/%s'", tmpdir->temp, path);
 				pkg_fatal_errno(
 				    "Fail to create directory %s/%s",
 				    tmpdir->temp, path);
 			} else {
 				pkg_fatal_errno("Fail to create directory %s",
 				    path);
 			}
 			pkg_fatal_errno("Fail to create directory %s", path);
 		}
 		if (fstatat(fd, RELATIVE_PATH(path), &st, 0) == -1) {
 			close_tempdir(tmpdir);
 			pkg_fatal_errno("Fail to stat directory %s", d->path);
 		}
 	}