From nobody Tue Sep 23 16:28:13 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 4cWQQ53HGZz68qnp; Tue, 23 Sep 2025 16:28:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWQQ52nRkz40Kr; Tue, 23 Sep 2025 16:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758644893; 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=z1pH2ARmFaa6Yk5CzZjDX6gla7FlHbA1AbQQB5RtliY=; b=UrEOWHd1Y9L4r289MInEtKjpMvb/hAOlMfAmlcC3HEsBEVyOFtjQDV8B8g5Pjk0zin6mDT MIN3mVhtfT4TbkWVOdtNbSk1louB/AdntZDnF30jvS2ncdOt1ow1LXvLEQLbhGXdQH92tt +VtQ5pWHGv5iKoiwOZ1bMILWYMxLeHBujImArMAm/JRe5UYVlVpRv2Ob/EDfiCKoZCevWo Fx7CXirZp6za97B2u9rc7hcyRXAu/Xj8prIBRxyDebX0l+xdNad+R+/UQcYn3PpQgeqztR o4zMQRER3Fb78Lg42UoGzlVTXgiJekv1kDKsnRLrMh5kv5Sxq9C8VKaPa/c04g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758644893; 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=z1pH2ARmFaa6Yk5CzZjDX6gla7FlHbA1AbQQB5RtliY=; b=jAh503eHoDvAT9gTi3MvPjhaaGiIG4GG3PAuInLL8XtUcyguy4Y2GzPwqA7bgkVXd6ZZ15 8Taz/xMAN8R8invfSVNDw8eUw4h7tpqqhdWYTMF+iOPzBk4eZP9YHp6CUkqMgOmxpoZPhU gbJfxgKS9EuooYxHyJ8Pn4cN778/fu67dysB9T308BsTgka35krWEqA6NqGvJqCcsa+3vb OQXpA48+94Zdr1ZXdICwwl0GSOgdu5yApVJZ2njjzk0IPsfjDdoGlN1ryPEH/T7DlVGjQj kTOef0XNjCYfdu0fpOSxsw0yY3Lt3+E+s0WtutpiK4vRgxS5gt6CZdVydYRWNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758644893; a=rsa-sha256; cv=none; b=BSXHe/6yosEatgQux8safCs71Q4eOkHj7ciYVHMr79TDQr0M7cy9hDqO4EVUoAIW90Tu73 V/Sl0Kx5CS/rzZ/x4ZT1YtOE+hYVXDRYjGzrWpgdYytfQ0ttJrILjyfYVsTLGB5j1YP7Nt jitazouF0CM0I3y9hAAAhOa5DwPQ3BV+q64I6lP79IXE59TkdKcueNN5IuKnLoCBkxB1rn FYo3PaDwZbr1l292AAjJR/vbAl2nSSo7mEdODqaM1vE9ptpBqTHUqV/ALQ0Tbr1ZAVijTv qIPKNHvkbxQOPuAn+ZSnkfLgghNZvoxncYkpZN2FPwfYTKJVUnHSKagRdAJSEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cWQQ52G8yzt2r; Tue, 23 Sep 2025 16:28:13 +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 58NGSDmf000744; Tue, 23 Sep 2025 16:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NGSD5b000741; Tue, 23 Sep 2025 16:28:13 GMT (envelope-from git) Date: Tue, 23 Sep 2025 16:28:13 GMT Message-Id: <202509231628.58NGSD5b000741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Sobolev Subject: git: 60be0d71daab - main - mksnap_ffs: fix running unded chroot 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: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60be0d71daab4247dc61c323777b0c593eb76975 Auto-Submitted: auto-generated The branch main has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=60be0d71daab4247dc61c323777b0c593eb76975 commit 60be0d71daab4247dc61c323777b0c593eb76975 Author: Maxim Sobolev AuthorDate: 2025-09-23 16:24:44 +0000 Commit: Maxim Sobolev CommitDate: 2025-09-23 16:26:09 +0000 mksnap_ffs: fix running unded chroot Fix "run-under-chroot" workaround by replacing strlcpy(2) with memmove(2) since strings overlap. MFC after: 1 week Reviewed by: arrowd Differential Revision: https://reviews.freebsd.org/D52670 --- sbin/mksnap_ffs/mksnap_ffs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mksnap_ffs/mksnap_ffs.c b/sbin/mksnap_ffs/mksnap_ffs.c index 0d8e32a15ab3..58939cc69029 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.c +++ b/sbin/mksnap_ffs/mksnap_ffs.c @@ -150,7 +150,7 @@ main(int argc, char **argv) errx(1, "%s: Not a mount point", stfsbuf.f_mntonname); } if (cp != stfsbuf.f_mntonname) - strlcpy(stfsbuf.f_mntonname, cp, sizeof(stfsbuf.f_mntonname)); + memmove(stfsbuf.f_mntonname, cp, strlen(cp) + 1); /* * Having verified access to the directory in which the