From: guenther <guenther@openbsd.org>
Date: Fri, 11 Aug 2023 04:48:14 +0000 (+0000)
Subject: cvs_file_copy() used futimes(), but only set the tv_sec fields,
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fd71e6a329ee2d6a44cd0fb734d7803da8f04d9d;p=openbsd

cvs_file_copy() used futimes(), but only set the tv_sec fields,
which presumably meant passing stack garbage in the tv_usec and
failing with EINVAL, whee.  Switch to futimens() and set the full
timespecs from the incoming struct stat

ok millert@
---

diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c
index 58971c60a53..1ab57a8bd46 100644
--- a/usr.bin/cvs/file.c
+++ b/usr.bin/cvs/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.275 2021/10/24 21:24:16 deraadt Exp $	*/
+/*	$OpenBSD: file.c,v 1.276 2023/08/11 04:48:14 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
@@ -1068,8 +1068,7 @@ int
 cvs_file_copy(const char *from, const char *to)
 {
 	struct stat st;
-	struct timeval tv[2];
-	time_t atime, mtime;
+	struct timespec ts[2];
 	int src, dst, ret;
 
 	ret = 0;
@@ -1085,9 +1084,6 @@ cvs_file_copy(const char *from, const char *to)
 	if (fstat(src, &st) == -1)
 		fatal("cvs_file_copy: `%s': %s", from, strerror(errno));
 
-	atime = st.st_atimespec.tv_sec;
-	mtime = st.st_mtimespec.tv_sec;
-
 	if (S_ISREG(st.st_mode)) {
 		char *p;
 		int saved_errno;
@@ -1120,10 +1116,10 @@ cvs_file_copy(const char *from, const char *to)
 
 		(void)munmap(p, st.st_size);
 
-		tv[0].tv_sec = atime;
-		tv[1].tv_sec = mtime;
+		ts[0] = st.st_atim;
+		ts[1] = st.st_mtim;
 
-		if (futimes(dst, tv) == -1) {
+		if (futimens(dst, ts) == -1) {
 			saved_errno = errno;
 			(void)unlink(to);
 			fatal("cvs_file_copy: futimes: %s",