From nobody Tue Jan 28 16:07:34 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 4Yj9D62BMlz5lgh2; Tue, 28 Jan 2025 16:07:34 +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 4Yj9D61dFzz3rM3; Tue, 28 Jan 2025 16:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738080454; 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=oA5nNAVWCxYXcV1TkZIs16aItrd3q3FJWr+pRswJqLc=; b=r7ZWjT73ImRlINWHXkTn1dwWeKpKvH820pO3bzrir8mewKkqHc9JhRnxh21khlZmoBOisG oaNjLlxzrmx3CL1z/MPscBNAzxTlFIqaFSQFIKOQIjgyGbPUzSF7tQBpBQdwnzSy/8WCek NxETuxMaqheIdxM9ufEkjjLsDuw+XtoNzxJj2T0Hds9GEfa5mlj5dWKAKwPdF0I0w1yMHF QQGFLMJ4ZSwHfYfMwCctIx1TFJ/SUGv4V2y8AcE7u0t8r97fVDDPtr2Y3RX3zJ8vd+S7Y9 lcSoIzs9hddWh7ayQGnLDkc+xytgeWVHCh6NOcuqFtP28jWvgnqZmVxw7bkNUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738080454; 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=oA5nNAVWCxYXcV1TkZIs16aItrd3q3FJWr+pRswJqLc=; b=nXMOVWnUAaZp6IYxLB3JREJ4B3R16RkzM7c1sA5CQ2iP4aQrWg75fW8lS1zbhTlKtmcmr8 F1eo0kJfs464euaQy163qeEfXCS51i4AvIIBNegC0RNjqtejgS0g9q52vcmpFDnBxOLHdm epqkOxPE+LP4ZDhU/a17jZR1vWTK1EPLMqwls7pkNk6GJv5jBXDdt3B951lsYrCZeMt2Wf tG0nn2tCOHabQtgJDdmBIk9iiYNqLffgJjHgEJIMkW1KUqYT6Cd49vAj4Xr2P+DNb+abr6 C0N+cOLHdYlgamJcbO3A9LqX34eDd8ngoeF8rm0y6Mu+goEXvRfFS/N/0tBLng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738080454; a=rsa-sha256; cv=none; b=KvnylHHXK+abx/MDCFuAD6QzjU4oxoSLJTPO4vq3FuCovQirua7bdPaOLkx8JOhUrBMArd 7K4b6ZZGkRKfPSsqD36YJ5sRlcjFIwOar7iESlOfzEcAfHFZ3lmZLSH3m1II89pByqoX9P jnR3eiqW8SEB34Ebk9Sh9Y4qX/dQ9MeroNe+UVL6RXhHC7mW+bLPyKNUEaO58/0XQWM6oV pCSb/QnN2eDOryghfwy94P0CPL9WBdS4v13b1slgCuRLUQmaA5aaMyoyKkp9/wpaBB459H PqbD5z0zuFJxVW3sBOAhxK68DesdMNIskXjMZiLraxlMtMYyFoFS2GoPFr46GQ== 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 4Yj9D61Ddsz5sb; Tue, 28 Jan 2025 16:07:34 +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 50SG7YSY047882; Tue, 28 Jan 2025 16:07:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SG7Ypt047879; Tue, 28 Jan 2025 16:07:34 GMT (envelope-from git) Date: Tue, 28 Jan 2025 16:07:34 GMT Message-Id: <202501281607.50SG7Ypt047879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 17e935f1f327 - stable/13 - etcupdate: Restrict access to the conflicts directory 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 17e935f1f327d7d4464e53f4f3d2347a51623f82 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=17e935f1f327d7d4464e53f4f3d2347a51623f82 commit 17e935f1f327d7d4464e53f4f3d2347a51623f82 Author: Mark Johnston AuthorDate: 2025-01-28 14:23:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 16:07:26 +0000 etcupdate: Restrict access to the conflicts directory In the window during conflict resolution, copies of installed files with conflicts are added here with the default mode. Restrict access. PR: 277470 Reviewed by: philip, jhb, emaste Differential Revision: https://reviews.freebsd.org/D48576 (cherry picked from commit c43ae7ab4bf89c2b274c1cbefe663c456e9211d1) --- usr.sbin/etcupdate/etcupdate.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 6d8f58d39c54..ed259da7420f 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -1561,6 +1561,9 @@ EOF # Initialize conflicts and warnings handling. rm -f $WARNINGS mkdir -p $CONFLICTS + if ! chmod 0700 ${CONFLICTS}; then + panic "Unable to set permissions on conflicts directory" + fi # Ignore removed files for the pre-world case. A pre-world # update uses a stripped-down tree.