upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-13 02:30:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cp: Fix copying to root directory.

Browse source 
The trailing-slash logic would strip the target down to an empty
string, which we would then fail to stat, and subsequently attempt
(and fail) to create.

Fixes:		82fc0d09e8
Sponsored by:	Klara, Inc.
Reviewed by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D50604
This commit is contained in:
Dag-Erling Smørgrav 2025-05-30 17:44:20 +02:00
parent 046800313a
commit 537fbf70f1
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bin/cp/cp.c
View file

@ -179,9 +179,9 @@ main(int argc, char *argv[])
target = dot;
} else if ((sep = strrchr(target, '/')) != NULL && sep[1] == '\0') {
have_trailing_slash = true;
while (sep > target + 1 && *(sep - 1) == '/')
while (sep > target && *sep == '/')
sep--;
*sep = '\0';
sep[1] = '\0';
}
/*
* Copy target into to.base, leaving room for a possible separator
@ -293,9 +293,11 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat)
/*
* We have previously made sure there is room for this.
*/
sep = strchr(to.base, '\0');
sep[0] = '/';
sep[1] = '\0';
if (strcmp(to.base, "/") != 0) {
sep = strchr(to.base, '\0');
sep[0] = '/';
sep[1] = '\0';
}
} else {
/*
* We will create the destination directory imminently.

22
bin/cp/tests/cp_test.sh
View file

@ -570,6 +570,27 @@ dstmode_body()
atf_check cmp dir/file dst/file
}
atf_test_case to_root cleanup
to_root_head()
{
atf_set "require.user" "root"
}
to_root_body()
{
dst="$(atf_get ident).$$"
echo "$dst" >dst
echo "foo" >"$dst"
atf_check cp "$dst" /
atf_check cmp -s "$dst" "/$dst"
atf_check rm "/$dst"
atf_check cp "$dst" //
atf_check cmp -s "$dst" "/$dst"
}
to_root_cleanup()
{
(dst=$(cat dst) && [ -n "/$dst" ] && [ -f "/$dst" ] && rm "/$dst") || true
}
atf_init_test_cases()
{
atf_add_test_case basic
@ -607,4 +628,5 @@ atf_init_test_cases()
atf_add_test_case to_deaddirlink
atf_add_test_case to_link_outside
atf_add_test_case dstmode
atf_add_test_case to_root
}