dumpon: use underlying device if encrypted swap is in use
/etc/rc.d/dumpon runs before /etc/rc.d/swap. When encrypted swap is in use the .eli or .bde device will not exist at the time dumpon runs. Even if this is addressed it does not make sense to dump core to encrypted swap, as the encryption key will not be available after reboot rendering the dump useless. Thus, for the case that dumpdev=AUTO and encrypted swap is in use, strip the extension and use the underlying device. Emit a warning if we are using the underlying device and the user has not configured dump encryption, so that the user knows that the will not be encrypted. PR: 238301 Reported by: Ivan Rozhuk Reviewed by: jilles MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34474
This commit is contained in:
parent
f1d450ddee
commit
67e751f167
@ -33,6 +33,19 @@ dumpon_try()
|
|||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dumpon_warn_unencrypted()
|
||||||
|
{
|
||||||
|
if [ -n "${dumppubkey}" ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
for flag in ${dumpon_flags}; do
|
||||||
|
if [ $flag = -k ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
warn "Kernel dumps will be written to the swap partition without encryption."
|
||||||
|
}
|
||||||
|
|
||||||
dumpon_start()
|
dumpon_start()
|
||||||
{
|
{
|
||||||
# Enable dumpdev so that savecore can see it. Enable it
|
# Enable dumpdev so that savecore can see it. Enable it
|
||||||
@ -50,6 +63,12 @@ dumpon_start()
|
|||||||
fi
|
fi
|
||||||
while read dev mp type more ; do
|
while read dev mp type more ; do
|
||||||
[ "${type}" = "swap" ] || continue
|
[ "${type}" = "swap" ] || continue
|
||||||
|
case ${dev} in
|
||||||
|
*.bde|*.eli)
|
||||||
|
dumpon_warn_unencrypted
|
||||||
|
dev=${dev%.*}
|
||||||
|
;;
|
||||||
|
esac
|
||||||
[ -c "${dev}" ] || continue
|
[ -c "${dev}" ] || continue
|
||||||
dumpon_try "${dev}" 2>/dev/null && return 0
|
dumpon_try "${dev}" 2>/dev/null && return 0
|
||||||
done </etc/fstab
|
done </etc/fstab
|
||||||
|
Loading…
Reference in New Issue
Block a user