From nobody Tue Jan 28 14:29:12 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 4Yj72d0Ldbz5lXBy; Tue, 28 Jan 2025 14:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yj72c6xfMz3Ynm; Tue, 28 Jan 2025 14:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738074553; 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=WC9t3o0xLKa2z7CTN8gmw5q7Cde9iXntOQCQ7nFGVWo=; b=SPgheLNp6zi8o8CEwL0XYWxuMgr699Nfm6fLI6gVxkKQQ3T3jEtXyN6CRaOWyT/gR+z0KO Dtur7w4u2+0r2V9W4nTgQmhUICd5na5dacgZGBO6OaEQceYhq7e0BPgw93b0hQdgsc6olV xSDkl/9xWjggLKnJodbtuy6aMkRqjVRCwPQP1txggMXhZrXR0YcnX14vUMo3z5xHdXeJ9t MbbpT1SP4SspFRtQJaMbI7tJWtVEhnJQ0Mja688fNcvs86gwuNfSeCvOBMAJLzzKB2+Csz G81uI/t7dODPjcD/6Dw01TWxfP9pO7ULiElmxuzwYIfj3tm8r6r/w4l19go1PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738074553; 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=WC9t3o0xLKa2z7CTN8gmw5q7Cde9iXntOQCQ7nFGVWo=; b=Psrsm6y0HUbfPuZhoR0XXicmTuzCZfUR7TPQA7U4V37t/DqcOE8XuhQhAerJGtuwAbBCLk A2+OPTSg9Q1fcv2uRLk18SEnleiE6KOE/cUgveKRW2nKJko77MB+Z0ZTduRRPMb5EunGIl K6JrhtT6zPaFswHa3lP57kg7Spvx88Y0nm296tRrCbvtQdtwjcmGClxLz725j9Vsb4DkH6 Wy+SOdwfPX23XWirmqNUrV7hhL/iwnPPuESkH+3w43bOWjigBGIGfKTstbNvNqym08tp2m yS9zUAb8vMofbhFX7MoXX/KGKQQW+UASHHfwST5UHGhTbQgH/n509Yw3YLwndA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738074553; a=rsa-sha256; cv=none; b=kdljrClJ5Rp1ZoPVA50XuQk7vfLsNQUCaa+og1fVYnSgN8vZGmCJZhlpxLwt3rSrtqyvgR eCYuB2eaHNwqaIhkO1lFfLP2Vjh0cDHwNeIr7zOeTZsW+rhYVLV8nMM6IrfPnC6nrbxKd9 gYFYgiv9R/m3WJDlboNfwGNnclB8fc33bU/kmEXl+HYsVMYwKmQCV5vhpQ2BIiTwapWPLD 5TQs+K/yVjqP18/0Derr+SoSj1ze48IRy2+fi8Vl9xHUjNbqZBMqikGQTFuSGIWJeNH9cf BTw/9CjlQwy2r1a7cytKTqoY2mIEfgz8ooKlSG8vQrJ7O+NPxKY8x4ldoX1qig== 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 4Yj72c6NGLz3q4; Tue, 28 Jan 2025 14:29:12 +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 50SETCFZ060181; Tue, 28 Jan 2025 14:29:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SETCck060178; Tue, 28 Jan 2025 14:29:12 GMT (envelope-from git) Date: Tue, 28 Jan 2025 14:29:12 GMT Message-Id: <202501281429.50SETCck060178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c43ae7ab4bf8 - main - etcupdate: Restrict access to the conflicts 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c43ae7ab4bf89c2b274c1cbefe663c456e9211d1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c43ae7ab4bf89c2b274c1cbefe663c456e9211d1 commit c43ae7ab4bf89c2b274c1cbefe663c456e9211d1 Author: Mark Johnston AuthorDate: 2025-01-28 14:23:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 14:23:06 +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 --- 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.