From nobody Mon Feb 20 07:18:18 2023 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 4PKv0C2Gd1z3s5vF; Mon, 20 Feb 2023 07:18:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PKv0C1PYSz3yH5; Mon, 20 Feb 2023 07:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676877499; 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=3sPayIv40/dtoZQaXQurayq7cwafH+d/FkWULbNg3TA=; b=ZTPFYbUZktmOUcyI8d6yo6GBW+EyzvSgj20T5J7fblMDkmLjPKUMUsAh1Lwbm9DxScIl4/ 1s0ysFvjVFNeTp4eFI0QRQYtLoGQ5wvC5pswtvB8GuCIBLTTOfAwl9MuX/90FuRNs3UUp1 8g7tl9jTBSU/e9QtlETmFbagnTw3h21UgxMYqH0xleGDIY00jvEBLFXi9tAkRPcl8LTXMb Xk9MChjDpDi1HHc8eW7gnC73gLsRCrP1/IEKdHUMSinP9DBW6RlrPElxi4/LuxDDSf+13i CXVy4q3Bukb40cf7ctflWX13n9gS6zz8TLwrL+Zd7WuKgQPDPpJK6mKwevlvrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676877499; 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=3sPayIv40/dtoZQaXQurayq7cwafH+d/FkWULbNg3TA=; b=v13N5jr2B/FXXsBQN7dXS960bIM0pIVWPjbO5VMG6fx8HXyJQt2NXXalikIww8zZs+HCzQ nFULMYOpIuoqho/Paqw3OAiO0x8ru4ls3ucKrWcD7QGIFIOqBauC6bCzSnDnyN+tecRh8a xDpGDCkj5yut8pDvo3Lp/VhAbOba/v824N8LrnjhX3jjvlSLJZipu0Jb7+urx4Vx/Thd1D Ez8emlFhmsu45icBtscmiIl2pdZK3ArUyW79+PzisYA5PTSiUw6P/M1kWUuE1BDyPRIvz4 83S5udLQJ7BMIBHuoXB5z77727Ezj6DIxwoJAlmVSup3eKj687rUvYeI5Mmebw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676877499; a=rsa-sha256; cv=none; b=o+ryCHdTVDUUwaP6xplmMz5B8LxfxHb2MwDV05T1oXCSLP6Cesk8x54wzdzaa+k2X3HTJH GBns/sdTKmDUlGhfbPBRGK661wx5Q33T3My8yi/JuF7Xyz4xtlYBB2EBcim8ovAGvXOBSA Ze//Un0y9k7jtZ/q5bTCloBZixPzXJcpXEhEXDgJHYguj4qPk5IWm7cUXcoQ2mzzqGzVTz dmJxni85pToCGeqZ/n+rmwbQ77bmgZJStG82ujBU0W5rZ49S9VTkrbDTDqZ7lWPHrgn0SH /I5eLbXqsO/1QxQxtlQ4VZKQm+WpizlBK5bGk/vJrHVXZywrNGnmJ6p2KScNnA== 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 4PKv0C0DmxzXXR; Mon, 20 Feb 2023 07:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31K7II1H077354; Mon, 20 Feb 2023 07:18:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31K7II8G077353; Mon, 20 Feb 2023 07:18:18 GMT (envelope-from git) Date: Mon, 20 Feb 2023 07:18:18 GMT Message-Id: <202302200718.31K7II8G077353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 04b24c1069a5 - stable/12 - cleanvar: Be more careful when cleaning up /var. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 04b24c1069a546056dc33fab1ce7b11d9bf89f14 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=04b24c1069a546056dc33fab1ce7b11d9bf89f14 commit 04b24c1069a546056dc33fab1ce7b11d9bf89f14 Author: Xin LI AuthorDate: 2023-02-13 04:56:17 +0000 Commit: Xin LI CommitDate: 2023-02-20 07:18:06 +0000 cleanvar: Be more careful when cleaning up /var. The cleanvar script uses find -delete to remove stale files under /var, which could lead to unwanted removal of files in some unusual scenarios. For example, when a mounted fdescfs(5) is present under /var/run/samba/fd, find(1) could descend into a directory that is out of /var/run and remove files that should not be removed. To mitigate this, modify the script to use find -x, which restricts the find scope to one file system only instead of descending into mounted file systems. PR: 269213 (cherry picked from commit 39e8c2a29a860bdb69ffcfbc06de4d4ad103b458) --- libexec/rc/rc.d/cleanvar | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/cleanvar b/libexec/rc/rc.d/cleanvar index fcfd365268c3..a682021ce5f6 100755 --- a/libexec/rc/rc.d/cleanvar +++ b/libexec/rc/rc.d/cleanvar @@ -31,15 +31,15 @@ cleanvar_start() { if [ -d /var/run -a ! -f /var/run/clean_var ]; then # Skip over logging sockets - find /var/run \( -type f -or -type s ! -name log -and ! -name logpriv \) -delete + find -x /var/run \( -type f -or -type s ! -name log -and ! -name logpriv \) -delete >/var/run/clean_var fi if [ -d /var/spool/lock -a ! -f /var/spool/lock/clean_var ]; then - find /var/spool/lock -type f -delete + find -x /var/spool/lock -type f -delete >/var/spool/lock/clean_var fi if [ -d /var/spool/uucp/.Temp ]; then - find /var/spool/uucp/.Temp -delete + find -x /var/spool/uucp/.Temp -delete fi }