From nobody Wed Jan 29 18:55:26 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 4YjrvM40Xcz5lmkl; Wed, 29 Jan 2025 18:55:27 +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 4YjrvL6SHsz3CYN; Wed, 29 Jan 2025 18:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176927; 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=cOUqPwt0pjpFSwwY2FrsDyFThHhqPhdiaKRvG2ET2FU=; b=iI8oImSLj8o/9i/jdhkVoe4WF9zqZedzJs44xYoyVtKrY4IT7K79ZgCyXPcKrzp2BA4loW k63mJYcQn0m8Ko2FvNVLFR8nFeIVZqmzsoF2LBnlWoSi+fP8frYqyvHP+Xi1l9/yo5APoU uJarcBL1HoAIq2azQXDtS/zLyORXXgGpK+poZZOgmaVMehXLNWwPsIakOh/vaCoVw5xDGD 4e2D2GQ3AuzLzbOO24c5G3v71q/HGcp31rsAcUBe2oB3Y4ZA6j/ppTwbHC19TytpYPkiXL 5I9w5IfkJBsf4El+JggVMM+57xzlg7qNQHwXqbNVw8XpGcZxAC/gxORU4fp1FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176927; 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=cOUqPwt0pjpFSwwY2FrsDyFThHhqPhdiaKRvG2ET2FU=; b=rUuAaXCXyJSl7wKZllP4xKAujVAFgBWMONYVNDk5Hw7W9SKVcMs+UqdPm7E4jjzsNDQekK etCG5VWMT4Pw3jnafrWgwXH6cPEBSKWFSQf+tuEu0iSffsMj0BVLX40ZsFOibTttZ5Abrm brA2QDN7nS5wQLh8KEWDILXDbxgakF5dlsrcEBpf5QcpmN1BiENNWeCbVNtlz0MpDtaWij XQVbxYNbl73p5JIoGs4WJ8NdWIVPIQyiJcoz2Uyo/GGOtiDDCAp6G+KRAScn6kzjJRJDNb 8TDihwAwyOszGRAhI3hgjdg5hbNf01alBmRaryypzCgFlea67PQjxKHd6V/now== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176927; a=rsa-sha256; cv=none; b=KKi8ENjLX8uTRstmucWPCZVq7m1xNoQIpIxThyhbt1bfcBRD8L+zw+Q37BhBV+vSiPpNeL E5dccB60ydGmS3+4buTsy9SzUXiL+Z6BPgyT7Fp/ShI7WM+4EZw/dLOpuR8o9JWEr1tQYw JYcKmfJjnG0LbOnZxb6dtLXKIuCE5woyvbcRPnYh8SqMLLBDFtsAELO//H8kIU0pAqoA/h Ev9ocv1ovwjW8mCm7vSoRr+eZSo+zX6Putbj2h5c61q262+HrigFnqkN7iXF4x8baklo1T zi9blD9eGot9yo0ePq6AlufRYEBis7QCMy4YvostWbdVS7UK5dnlqZmvsdIEbQ== 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 4YjrvL5r2rz1k; Wed, 29 Jan 2025 18:55:26 +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 50TItQEE064900; Wed, 29 Jan 2025 18:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TItQgu064896; Wed, 29 Jan 2025 18:55:26 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:55:26 GMT Message-Id: <202501291855.50TItQgu064896@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: b8945a926a2f - releng/14.1 - 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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: b8945a926a2f10ebac7458b44e81acdc84413a91 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b8945a926a2f10ebac7458b44e81acdc84413a91 commit b8945a926a2f10ebac7458b44e81acdc84413a91 Author: Mark Johnston AuthorDate: 2025-01-28 14:23:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:13:21 +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. Approved by: so Security: FreeBSD-SA-25:03.etcupdate PR: 277470 Reviewed by: philip, jhb, emaste Differential Revision: https://reviews.freebsd.org/D48576 (cherry picked from commit c43ae7ab4bf89c2b274c1cbefe663c456e9211d1) (cherry picked from commit 93836ff92be84a1d4e7611577ffe116a0e30d008) --- 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.