From nobody Wed Nov 05 19:56:23 2025 X-Original-To: dev-commits-src-branches@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 4d1x0R4PG1z653sP; Wed, 05 Nov 2025 19:56:23 +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 4d1x0R3l1Kz428L; Wed, 05 Nov 2025 19:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762372583; 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=/bgLvleotC0XvVOFVCu+DcpTyMjYiSEjn2aB+ww2KwU=; b=vysEeyGM7iC9/iPFUF0o7ftLcTDy8ARtDwctahyHdxJao9afsB3UdKFTq0Dhmsy3bpVFHO 9DHP+gocGuhFsfD7DqSA++Pgz20m5vbt+pD94AE9A0GT+XxheZ6A52tnbGqLGzwx/x/EF0 QFMHDxdvQXXwVzzp0DI7ffmipDMgPm5pxb2rAzB8G1Ygkgnt9w5VrlkE5UbVeK9n1m39Kn yzQJJRd6yusrbzMS+GURstHKI9fkZIe8VoOI6Q4EXnOCYwF5eprvX/InnrTXi+VLjIT51v CMhH3njNhXZokVI0OG8PqXrrHPJ82Wd4Cl4MNskERsdAwqeux7+eNumMbmGxKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762372583; 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=/bgLvleotC0XvVOFVCu+DcpTyMjYiSEjn2aB+ww2KwU=; b=GW5vfVd2bd1hm30FMoNBLM1rubnZi3sI317NTdh6pRm5TN70hNmp+A2V5CfPh9CApaJ+Bj 35Hr7ZiuFfgDXuS8wrOuJVoCt4fqN0ujeR692CdLbXCHBTtTpMPrDMRbFEBjdKYudCxaPk rlh4hVHX4L1/FrPR+WSesMKTtRjxn3Nm8R0sIV42lGhqyyoIepq1Pi6QGvbB3rMNFdqpL+ G0sG2URtdghyjfLSZEbmcHY1qEkPCHvbv09tXwiOIO23Ia7ZrqJzxi/gCoaf/FMLrTd0/h Ww5/i3wsVP6m9U+2QikBXI9tDtpsdNDiEx3ZvfjdYywk3BhoQJO6j83YqlXfRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762372583; a=rsa-sha256; cv=none; b=ix9sxe9EF9jU9DkvJJ2L3gkOOcW79u88t1XxVWvDYn/XbcJNdbtsRQPkNZWPkCfwgRjFM8 NKDc7NDRkwuynUwd5af7ZLqEUhIw3dk48CJr/Zth4beiCBkzoUqGa1W2RxyAbX/XW9kVix dmbEyrM2yh4BjwRQuDsxRxnh8WvhGXf6xCu0Bw9oNbJpdHwwdKQZ1zeIoLNQGEEmx6UydW t9aMN8B4CVDM6LVGmlquuMIAbKOrxvMy1rXPWr2IdFZjLGM+H1Gs3ac8cd8C7+ir9Tw+KX ypvzKLQx9ZOi5BP2spjDS2y6xKuR57DVa89TBunHvFZ/1noj3gGnGUWe/aR6aA== 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 4d1x0R3JtYzy59; Wed, 05 Nov 2025 19:56:23 +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 5A5JuNtJ023456; Wed, 5 Nov 2025 19:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5JuNIn023453; Wed, 5 Nov 2025 19:56:23 GMT (envelope-from git) Date: Wed, 5 Nov 2025 19:56:23 GMT Message-Id: <202511051956.5A5JuNIn023453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 222ea8bff5db - stable/15 - mksnap_ffs: fix running unded chroot List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 222ea8bff5db75711c7459f4b794b0a40e11a463 Auto-Submitted: auto-generated The branch stable/15 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=222ea8bff5db75711c7459f4b794b0a40e11a463 commit 222ea8bff5db75711c7459f4b794b0a40e11a463 Author: Maxim Sobolev AuthorDate: 2025-09-23 16:24:44 +0000 Commit: Maxim Sobolev CommitDate: 2025-11-05 19:56:13 +0000 mksnap_ffs: fix running unded chroot Fix "run-under-chroot" workaround by replacing strlcpy(2) with memmove(2) since strings overlap. Reviewed by: arrowd Differential Revision: https://reviews.freebsd.org/D52670 (cherry picked from commit 60be0d71daab4247dc61c323777b0c593eb76975) --- 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