git: 57c37babde36 - releng/13.2 - cleanvar: Be more careful when cleaning up /var.

From: Xin LI <>
Date: Tue, 21 Feb 2023 15:38:08 UTC
The branch releng/13.2 has been updated by delphij:


commit 57c37babde3664c81bc30ec5086092ae950aab49
Author:     Xin LI <>
AuthorDate: 2023-02-13 04:56:17 +0000
Commit:     Xin LI <>
CommitDate: 2023-02-21 15:37:30 +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
    Approved by:    re (cperciva)
    (cherry picked from commit 39e8c2a29a860bdb69ffcfbc06de4d4ad103b458)
    (cherry picked from commit 0699f0d43416776d87d20d7953b7d686f1e2e572)
 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
 	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
 	if [ -d /var/spool/uucp/.Temp ]; then
-		find /var/spool/uucp/.Temp -delete
+		find -x /var/spool/uucp/.Temp -delete