From nobody Mon Feb 20 06:16:33 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 4PKscx3Bh0z3s1qh; Mon, 20 Feb 2023 06:16:33 +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 4PKscx2kBdz3t82; Mon, 20 Feb 2023 06:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676873793; 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=FnH7jP/QY49LfWnhJ1iB0WVis1HV6nixvBd3aETp+M0=; b=Co3bVstxUztAER0L9AYPoO/ciATycExssu4+FEVVz3NFiopg1OJvU4UAri1KWwVerKSGQd O3qWbF32KPmQ4b6K7mKuYY1e4drYPZXmKFf4OIzfxV+SrH0sjKjulSiv68c0kG9B4c2uNc Ys9V6j38E49c7epXRfGLPHh4jBZaU0/P7+4vpxYkMVkOWg/l5R9iV1G3QmXAjgJOZ9+L0b rGjgAyGFejDLByqSWOLaqNyxLl7olJS+RZh5bSz0Dua+pNZNZl+NAE4WUAIrm5d0gQqdly 9E4fJhllRO8+hHWTNq2iMGmURzEafbtBd2uPPXDuCsLFecOMNX4LUeOhXUegmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676873793; 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=FnH7jP/QY49LfWnhJ1iB0WVis1HV6nixvBd3aETp+M0=; b=Ickk97Xv40q3h5e5v75Pm6+UlfhFMDrJDowpoXxFAFxBhQroQ3BQ+gME6ys4oiRU+nLq/c p3atid7z4RkYL+AaGMl9uy/MmwiuJLcrj4wN6DSiPExNsharwn2ix6HEbScZFXK78B1hEU uks5va9QkHz2G4eKL9pC6e0euO31whlQGoT/DNJQt9bUtFuYm1iRJXDHSpzpp7ZnKheA9q NAg7qYrNwpwo/FTs0fa/9vHpsk6O7zPpBsIZGvK69gr1l/M5eeg+6ornl3ognUgLI4yJr3 D/8hheSGKgOIQKMjqnKaSmRX9hwHmPY880DJ6QPNi15hqyM6yfBDHV5Hbtr+Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676873793; a=rsa-sha256; cv=none; b=pidkdDmhG4/Mk+y3RnQNxtUNt2dkSpAgmQ4Ev/h1ZbtvBKKy+/tH8UXZSaSHuf+KEx97wu ihhFk9m0szTBXP0lqEFrYNy1xvOjqaCfk3wd0hvMfqnWFrr/gZflTtTgH6PvvLI0Hpik6P HnH2H90NWx9WDnLK7xkrWn1EUi05KZv4pLksAGlLBTPTyXH2LDRuQwEnDp2qzwiK9JuwZz ZMmEftx5a18XZagrBmMldKRzVu7Z3AGWw4l6wDy6wYOKQbLXi8i9jHakWIqbdv4wwP0m2D /wHNEmJwP1doCQ8EBLHkCy9vn/CnLj6eSIUNWnyCG0suKEdwfjncHCRmsw2uLQ== 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 4PKscx1nwHzWMd; Mon, 20 Feb 2023 06:16:33 +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 31K6GXiT091954; Mon, 20 Feb 2023 06:16:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31K6GXc2091953; Mon, 20 Feb 2023 06:16:33 GMT (envelope-from git) Date: Mon, 20 Feb 2023 06:16:33 GMT Message-Id: <202302200616.31K6GXc2091953@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: 0699f0d43416 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 0699f0d43416776d87d20d7953b7d686f1e2e572 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=0699f0d43416776d87d20d7953b7d686f1e2e572 commit 0699f0d43416776d87d20d7953b7d686f1e2e572 Author: Xin LI AuthorDate: 2023-02-13 04:56:17 +0000 Commit: Xin LI CommitDate: 2023-02-20 06:16:20 +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 }