system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-08 20:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cp: Additional sanity check.

Browse Source 
Once we've successfully opened the file we've been asked to copy, check
that it's of the same type as FTS told us it was.

MFC after:	1 week
Sponsored by:	Klara, Inc.
Reviewed by:	allanjude, markj
Differential Revision:	https://reviews.freebsd.org/D44806
This commit is contained in:
Dag-Erling Smørgrav 2024-04-17 03:36:26 +02:00
parent 64d6925d19
commit 9075d4cfad
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/cp/utils.c
View File

@ -100,20 +100,33 @@ copy_fallback(int from_fd, int to_fd)
int
copy_file(const FTSENT *entp, int dne)
{
struct stat *fs;
struct stat sb, *fs;
ssize_t wcount;
off_t wtotal;
int ch, checkch, from_fd, rval, to_fd;
int use_copy_file_range = 1;
from_fd = to_fd = -1;
if (!lflag && !sflag &&
(from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) {
warn("%s", entp->fts_path);
return (1);
}
fs = entp->fts_statp;
from_fd = to_fd = -1;
if (!lflag && !sflag) {
if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) < 0 ||
fstat(from_fd, &sb) != 0) {
warn("%s", entp->fts_path);
return (1);
}
/*
* Check that the file hasn't been replaced with one of a
* different type. This can happen if we've been asked to
* copy something which is actively being modified and
* lost the race, or if we've been asked to copy something
* like /proc/X/fd/Y which stat(2) reports as S_IFREG but
* is actually something else once you open it.
*/
if ((sb.st_mode & S_IFMT) != (fs->st_mode & S_IFMT)) {
warnx("%s: File changed", entp->fts_path);
return (1);
}
}
/*
* If the file exists and we're interactive, verify with the user.