From nobody Wed Jan 29 18:54:57 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 4Yjrtp5c5qz5lmbj; Wed, 29 Jan 2025 18:54:58 +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 4Yjrtn5cd1z3Byl; Wed, 29 Jan 2025 18:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176897; 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=HxspITxlx/+XbNo//kw++8Qids2yanH/0N5QwrVN9Ao=; b=K7Z9XaHdcT6eTgT8Q+1Trykxprf8fv9TdU+jcXfd7btNY1hJjL+mf25kcboMk2mnxdmzur exjLi+Xsd9lDKZF14JSkiWhsA9Zt9nrVqn4+x1jqzR41UbilGMhvoYk06qS6SGnpnnMUz7 VCoOmqgQXa/KtiznJI43gMnKi4IBo/WuXd23Ool4yMdeaEP7Nm8nniv8CErt2URzJIAqzL gtmlmgp1/hCxyLesp+9MJlOL3yt8dlojTSlWqCkVFAooa0wb/DzYYlR/ZK8A77KpMrDxvR p+fB0P6aBOmEdtApEyGi5B2rK1alv6uZS79gcR/Z/VfQhuOYcvT4Jqj4lI9YMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176897; 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=HxspITxlx/+XbNo//kw++8Qids2yanH/0N5QwrVN9Ao=; b=iw+uvC+5obTuQ4Zb7kkKnYv+HRS7YifSEqq9pZYCzig6ot6tMCR3Ep4rr+mBXsk7KEUlva 82OimKqQdeuScd0JboN1Vv4lbu0gTd+nVEEIgOSPr3gcOFUDta0GCKmy5ILG8AVXQC5s3l AolTYc5tcWLZ/MXBfr6xy/uDpoTs3z1SbFLUUS/FO6joLhaa0vIa8Cnczdf68eyqpueyk5 CKaMnfdt3JnaYCvnk1d6Q8tNmSVErmQ1V5DdGLLrdIPgOtR/kbuMqLH2Q+7mJW0iqpvPcK svKrQiboL2i6hTSHSsQA3l9laeRvO3j3cvPCKiyWSyyGwgbTF3KzOCkS35/uQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176897; a=rsa-sha256; cv=none; b=CgJGRlfbyp7qK+qwEKPY5sBdsx6T1p16FY8/m7P5gnzqbl+F1uzHfljhtxFAY+66UHkIxW GbIk80YUZ7JH6kyYNEhk3F6wKxzOY5h6ZNE8Uy36ULxOhhinjHGOPlXXFuuXAdBkFZw3sU w8+qjRn2/oqLUAqaOZ4I42M1xCgv99C+uodk56jfkEAVM++UcxIVyRDlW2xb69XY3P/gTn Ejptx8rxgm/nxn74oQOdFg2uU9B/ldSTjlte8MBl0uooTFP2+tzuPmHnYo0AglosPKxkRc p3LTp2DXfd9fjFRJkwtlbaRPg2Rv3G4LLaQ3cudRfA+owvdcrXaSoTYjiLQPtg== 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 4Yjrtn594Cz1CbM; Wed, 29 Jan 2025 18:54:57 +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 50TIsv91064120; Wed, 29 Jan 2025 18:54:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TIsvIO064117; Wed, 29 Jan 2025 18:54:57 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:54:57 GMT Message-Id: <202501291854.50TIsvIO064117@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: c55000e7c233 - releng/14.2 - 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/releng/14.2 X-Git-Reftype: branch X-Git-Commit: c55000e7c233573bae396df6099dcfc564abdcb7 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c55000e7c233573bae396df6099dcfc564abdcb7 commit c55000e7c233573bae396df6099dcfc564abdcb7 Author: Mark Johnston AuthorDate: 2025-01-28 14:23:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:27:37 +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.