d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanvar: Be more careful when cleaning up /var.

Browse Source 
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
MFC after:	1 week
This commit is contained in:
Xin LI 2023-02-12 20:56:17 -08:00
parent 81b9905234
commit 39e8c2a29a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libexec/rc/rc.d/cleanvar
View File

@ -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
}