From nobody Wed Jan 29 18:55:30 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 4YjrvQ5rxYz5lmpX; Wed, 29 Jan 2025 18:55:30 +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 4YjrvQ2GWMz3Cbw; Wed, 29 Jan 2025 18:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176930; 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=vd5Qwfy9nMKh2uYILLUlWyFMB74IvTRm0fQFyLcohl8=; b=sOUmiW0W68+iLd8t7D/J9wOcN94lKlDnyP85CPwHykXo1qXDZAc6i7vSrrEpqa5piyD1yd 2MnNsbXDj9Zwt68QXH1XNGr55ccrw2Nz50ABSX8pis0baPggaiv4L6IzMSzzVv86UcUCVC pxNH3ZvA+Ah7+w99tZ2FI4g5aDNNwF85NUtnQ8LaE+GqpL9xXcp6sjq7wYIKqjCZlJXCEn LWutRiw30YrstniHPqyZWaC09PbMyAPf1BuulJv7SNKX7g+HKg1WXp0mona7Yhbprx46K8 rcWhpqnanUNmMGTXwsmk8YdQNKgGPdfmXdEf40zj1GQSHFtN0FTjpQX9UQUZ1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176930; 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=vd5Qwfy9nMKh2uYILLUlWyFMB74IvTRm0fQFyLcohl8=; b=aY6f99xXwj59j2LgqOUAxOPE6z7QCA+8dCQ4CA4zxB/RFlbmTvUhWjLrYjOGDlkTmo+c1w v6Ulf1vbKoKhsqeIXsICaMW9yUIFnpPQVHpdcfVVbidRIcAno6E13gzJxvtCGYdmgBi11w vVITk4xS9wc43BZInX6j9/c32xPwpi434obwwd9ImqkzQjMXmy6JdM3WfOGMGt9cu8N4CW EkQf4nY/Pk8wehO1yMenyKpNH9txoVekc5JowYXVKhvPbU4tKbaGzxm308Qyf8sy38Pq4i i8XC5fZl9gtF2IHp7kfK7zERxFxUVKY8zKZ8+spwU3Yh6w3C0o0hImRcMsbKyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176930; a=rsa-sha256; cv=none; b=p9gTnZuzr1nMZYwMSjG5Hj5SFJ1+onCyroC88tR9RsbX2YBWVlJRirzftMHDvf8SaJ8q9r 6BlNgE29kznKCjgAHs/sfZoeaV60sgKEcOsVUVNNyBb7ASYGghJKWzGTLuFWnr62+C/1f2 mgeIZQgTmVvgxYCbJbD3vn6pv30/rgaPrVznNkJW3l3K/7N+fFKVaZUM2LCQ6nPaUqzsIp u7fu/Ujdk4chROVNEWM57f51XPEgx0z4E/8c/E59OtJKxzEJ1oe6fC21NfzZejfS3qBgSl BS/24sylzjAguNSEaG6tL+mJRIgAZvXFAuONCDcGmoyCZJ04/Y1eBDw4I12xdg== 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 4YjrvQ1rdqz1ChW; Wed, 29 Jan 2025 18:55:30 +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 50TItUsJ065137; Wed, 29 Jan 2025 18:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TItUs6065134; Wed, 29 Jan 2025 18:55:30 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:55:30 GMT Message-Id: <202501291855.50TItUs6065134@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: c1c180910d46 - releng/13.4 - 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/13.4 X-Git-Reftype: branch X-Git-Commit: c1c180910d4677b00c7651d72b13f63f8f1c646c Auto-Submitted: auto-generated The branch releng/13.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c1c180910d4677b00c7651d72b13f63f8f1c646c commit c1c180910d4677b00c7651d72b13f63f8f1c646c Author: Mark Johnston AuthorDate: 2025-01-28 14:23:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:02:44 +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 17e935f1f327d7d4464e53f4f3d2347a51623f82) --- 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.