Robert Frohl
1c9146ef2a
OBS-URL: https://build.opensuse.org/package/show/security/lynis?expand=0&rev=102
33 lines
2.1 KiB
Diff
33 lines
2.1 KiB
Diff
Index: lynis/include/tests_filesystems
|
|
===================================================================
|
|
--- lynis.orig/include/tests_filesystems
|
|
+++ lynis/include/tests_filesystems
|
|
@@ -835,15 +835,18 @@
|
|
AddHP 3 3
|
|
if IsDebug; then Display --indent 6 --text "- Module ${FS} not present in the kernel" --result OK --color GREEN; fi
|
|
fi
|
|
- FIND=$(${LSBINARY} ${ROOTDIR}etc/modprobe.d/* 2> /dev/null)
|
|
- if [ -n "${FIND}" ]; then
|
|
- FIND1=$(${GREPBINARY} -E "^blacklist[[:space:]]+${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
|
|
- FIND2=$(${GREPBINARY} -E "^install[[:space:]]+${FS}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
|
|
- if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then
|
|
- Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN
|
|
- LogText "Result: module ${FS} is blacklisted"
|
|
- fi
|
|
- fi
|
|
+ for SUBDIR in "${ROOTDIR}etc" "/usr/lib"; do
|
|
+ FIND=$(${LSBINARY} ${SUBDIR}/modprobe.d/* 2> /dev/null)
|
|
+ if [ -n "${FIND}" ]; then
|
|
+ FIND1=$(${GREPBINARY} -E "^blacklist[[:space:]]+${FS}$" ${SUBDIR}/modprobe.d/* | ${GREPBINARY} -v "#")
|
|
+ FIND2=$(${GREPBINARY} -E "^install[[:space:]]+${FS}[[:space:]]+/bin/(true|false)$" ${SUBDIR}/modprobe.d/* | ${GREPBINARY} -v "#")
|
|
+ if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then
|
|
+ Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN
|
|
+ LogText "Result: module ${FS} is blacklisted"
|
|
+ break
|
|
+ fi
|
|
+ fi
|
|
+ done
|
|
done
|
|
if [ ${FOUND} -eq 1 ]; then
|
|
Display --indent 4 --text "- Discovered kernel modules: ${AVAILABLE_MODPROBE_FS}"
|