From nobody Tue Jan 28 16:07:18 2025 X-Original-To: dev-commits-src-all@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 4Yj9Cp6Dzhz5lggx; Tue, 28 Jan 2025 16:07:18 +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 4Yj9Cp3Mrqz3r6H; Tue, 28 Jan 2025 16:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738080438; 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=1nc+e1wW7OCXnHXWfu3xxaoT1+o3Pv7u5pMkTIiLUHg=; b=FKiaE1+Hqdax8aWO7nXAnwOaCJerZ/JNK2pmo7S4v4BKIOiTMOLtZZ/nvgeq4wsNFoHH13 sRqPgLXXroAx4UmZdAv7Z8eOxBjGHaE7BL15BiLCJdhdpLRPjFDVMcva/IgHVmhGta3iRF dV3cEoEyo4oZyKwCx8Nzd7GNN8FMMFLD9qJ+BNwLbPGt8L4DIbLaZkdoj6MBtuSuurHvIN TrQrmQLpwXxR/cY2EddwAYGnUaFTlr/mXguPpVR+ZIWi+yynyvqnzd1q+b9cUuPOHIP++K D9+rM/yBU/vqOQK14fMMpabVyp/U6dMkX3oT8RHwC8gAsoDxujIQQbUbsL1UPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738080438; 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=1nc+e1wW7OCXnHXWfu3xxaoT1+o3Pv7u5pMkTIiLUHg=; b=Aj4YR76FrdDMjNLifKEoameZL0qggdkymDupeQP2oOgCwZIexrzbQSWNR8LFJ//D4BnuOO G03tX9Ddj0epDuyHg2ccu5aolZUUrWtz7zKr9WydqU+mN5zV5y6XdnXc9YEmbRTm4NIjTL aKP2vWSQuH8EQbeN4AeDUPGnR3HGvhuHF2907aarSvxPnE2xfl5wAmxLX4S4wPDGzhwgdw 9gPE+ecgvVxUxX15QJA+CfEFn3CA1a+Cdbkg1YqjeNJYsrnF1s0Q1CPODJj+KNQQxjqsl4 rKDJLS8ECA2FExdnTGPjNI0xGbQOUnJl5ikLprRaZ9OmdW7Sr66mQ4Ghj4IWGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738080438; a=rsa-sha256; cv=none; b=kZB4KP8kgZz7DRmtbzvyCpBvZiH4ZYeqIshGe/rgypZrAKCJAXRix5dHt9zOfkPXMHNh3b LXBYpZ1xSGeov8HQ1VEDyuCIkEZFYZAAw4JqB+sEu4FiF1rXz8ELBvXDdZsVJBjKY041pY vIpzUBYHNyZOfrpOOOdn+4Sf3Z6WP33m6FnYkrdC3x6z/L9DSglQIOituIJk9lZQMtqhGu LXj6qRpv7/bOE+LgpkJWPbJWVGZkJenSRJC7S5/Pq/XzovNXpn8f2J2IWK7rPbP0ht7GdR tDH3Mem+Fy5Nx267xSlG2Mb/DftCS3dHXDnoMbCGi3wKtMKw/DvzCQ421f9m/w== 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 4Yj9Cp2zTsz5KH; Tue, 28 Jan 2025 16:07:18 +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 50SG7IB9047681; Tue, 28 Jan 2025 16:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SG7Ifx047678; Tue, 28 Jan 2025 16:07:18 GMT (envelope-from git) Date: Tue, 28 Jan 2025 16:07:18 GMT Message-Id: <202501281607.50SG7Ifx047678@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: 93836ff92be8 - stable/14 - etcupdate: Restrict access to the conflicts directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 93836ff92be84a1d4e7611577ffe116a0e30d008 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=93836ff92be84a1d4e7611577ffe116a0e30d008 commit 93836ff92be84a1d4e7611577ffe116a0e30d008 Author: Mark Johnston AuthorDate: 2025-01-28 14:23:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 16:07:11 +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 39d1f9e56a54..7bddd6593b56 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -1611,6 +1611,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.