Fail if regular file pre-exists in copy_tree()

cgzones · hallyn · commit 1d281273b149 · 2022-08-17T12:34:01.000-05:00
Similar to the default behavior of mkdir(2), symlink(2), link(2) and
mknod(2).
diff --git a/libmisc/copydir.c b/libmisc/copydir.c
@@ -723,7 +723,7 @@ static int copy_file (const char *src, const char *dst,
 		return -1;
 	}
 #endif				/* WITH_SELINUX */
-	ofd = open (dst, O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW, statp->st_mode & 07777);
+	ofd = open (dst, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC | O_NOFOLLOW | O_CLOEXEC, statp->st_mode & 07777);
 	if (   (ofd < 0)
 	    || (fchown_if_needed (ofd, statp,
 	                          old_uid, new_uid, old_gid, new_gid) != 0)

Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,7 @@ static int copy_file (const char src, const char dst,`
`723`	`723`	`return -1;`
`724`	`724`	`}`
`725`	`725`	`#endif /* WITH_SELINUX */`
`726`		`- ofd = open (dst, O_WRONLY \| O_CREAT \| O_TRUNC \| O_NOFOLLOW, statp->st_mode & 07777);`
	`726`	`+ ofd = open (dst, O_WRONLY \| O_CREAT \| O_EXCL \| O_TRUNC \| O_NOFOLLOW \| O_CLOEXEC, statp->st_mode & 07777);`
`727`	`727`	`if ( (ofd < 0)`
`728`	`728`	`\|\| (fchown_if_needed (ofd, statp,`
`729`	`729`	`old_uid, new_uid, old_gid, new_gid) != 0)`