From nobody Fri May 30 15:44:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b86xh3w1jz5xpPZ; Fri, 30 May 2025 15:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b86xh1Qsrz3Jts; Fri, 30 May 2025 15:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748619896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxHCn4cc9U4+tWBDs7c7sTGd2cAcThGiXnrfqJ6SmE4=; b=idtYlGkwH95CyRWCzZ+w5WVrQ/b/uHVcbxlFsr9Zys5rU3Ru0imPe1lW4ZAZup/AKPgRUZ 6yv4p9C25hGeZBSr229MVTD9TxmM56GHYLR14nJJoc/CCjvOFxP3p9/9AtFZH6pGR22e9F G28a4BCuFqHSeOZvXjHDrL+nFdiWPScOewKRaQX/QHHKmsv/QquDJ2RRnxJqncrr72lJCz OQGwy6jEDPi4t3hsmvrQsIZzFJpQQLOxyaZtc2jwnm18+lYORkaV61Cq0pBrB2iJT/8eNL RCZMstaACOsur+dn3mmmiWcTuH66gwZVzZcmTszroZrF/NIvVUk7q8917IkRDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748619896; a=rsa-sha256; cv=none; b=isiHKn1lx3Hy/Qr2ItgG35h+cgMHX7mJSEvQN6JbQnKORlsyrLvsDP3kLiCTVbPTsfodmH ObApALhPUZ8jafoPHzYQCdiy4ePoM1y/3bpa8HSZyklANh1tzmYSn/IQinSEz5H7u4fmbT Qmj8Qw92NpxQrZ7smNtn6K3IgwQ7xh4KM+r56yT1K1CdO2vt2PJBsxRDQp+lQaiJOMZP0U QCyJsQ7q94Ge09CEuKBHkj/dGqoGV2QLoYXODPDNafD/EzMdbdlis6WwjK5juE2Tk5g/L3 hvWAAFdvAgvr+qLmvgu+4CfQMuKo2Q6naqbEy1+esLkqvv79Z1N3ThH91/VcSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748619896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxHCn4cc9U4+tWBDs7c7sTGd2cAcThGiXnrfqJ6SmE4=; b=SitdVewtQxumOCXwC8xsRDaYwSI/DtU4LCoW6GxfKr3qGHco9Oiu6TZ46K1Uhe60bA9Xi8 QWUEPQ/1K6cI4leks/pN67U6ZN2z9Sgiis+vFZrROPh9/j2ug5lNDRS988r3phXkWPwWkb eNOQ85suzLjjZFvIiJ3V4uVPzbzKr3XuXpidfCnCarLlvD0jOf8A9RI8HcOzmH6sy2naIW kjNDEtkIXDREWlzImfz/t0hBO453Yj3Mri/tmuRCUPDd1XHaWc8jL2FbvPRF9j0DjBcFhQ R0TPDTZxiKFUy/cy7Qrr/UP/umIsLUVH4L076K7w95o6vg+8uN03S77VSfgArw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b86xh0d0fzym7; Fri, 30 May 2025 15:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54UFitFm060196; Fri, 30 May 2025 15:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFitx2060193; Fri, 30 May 2025 15:44:55 GMT (envelope-from git) Date: Fri, 30 May 2025 15:44:55 GMT Message-Id: <202505301544.54UFitx2060193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 537fbf70f12b - main - cp: Fix copying to root directory. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 537fbf70f12b014d68fc087ee6e254523c73d489 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=537fbf70f12b014d68fc087ee6e254523c73d489 commit 537fbf70f12b014d68fc087ee6e254523c73d489 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-30 15:44:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-30 15:44:39 +0000 cp: Fix copying to root directory. 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: 82fc0d09e862 Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D50604 --- bin/cp/cp.c | 12 +++++++----- bin/cp/tests/cp_test.sh | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 03b3a7a7bf41..94a22c1cccc5 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -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. diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index bb45cc2484f5..8511904a0e33 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -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 }