From 74661a7d8ffac59404bb1cc29aa86888ec62e83a Mon Sep 17 00:00:00 2001 From: David Windsor Date: Tue, 19 Oct 2021 07:55:15 -0400 Subject: [PATCH] Apply suggestions from code review Don't fail if chcon is not present Co-authored-by: Leo Di Donato Signed-off-by: David Windsor --- scripts/falco-driver-loader | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/falco-driver-loader b/scripts/falco-driver-loader index 9dd165e6..b13a8a44 100755 --- a/scripts/falco-driver-loader +++ b/scripts/falco-driver-loader @@ -161,8 +161,8 @@ load_kernel_module_compile() { chmod +x /tmp/falco-dkms-make if dkms install --directive="MAKE='/tmp/falco-dkms-make'" -m "${DRIVER_NAME}" -v "${DRIVER_VERSION}" -k "${KERNEL_RELEASE}" 2>/dev/null; then echo "* ${DRIVER_NAME} module installed in dkms, trying to insmod" - chcon -t modules_object_t "/var/lib/dkms/${DRIVER_NAME}/${DRIVER_VERSION}/${KERNEL_RELEASE}/${ARCH}/module/${DRIVER_NAME}.ko" > /dev/null 2>&1 - chcon -t modules_object_t "/var/lib/dkms/${DRIVER_NAME}/${DRIVER_VERSION}/${KERNEL_RELEASE}/${ARCH}/module/${DRIVER_NAME}.ko.xz" > /dev/null 2>&1 + chcon -t modules_object_t "/var/lib/dkms/${DRIVER_NAME}/${DRIVER_VERSION}/${KERNEL_RELEASE}/${ARCH}/module/${DRIVER_NAME}.ko" > /dev/null 2>&1 || true + chcon -t modules_object_t "/var/lib/dkms/${DRIVER_NAME}/${DRIVER_VERSION}/${KERNEL_RELEASE}/${ARCH}/module/${DRIVER_NAME}.ko.xz" > /dev/null 2>&1 || true if insmod "/var/lib/dkms/${DRIVER_NAME}/${DRIVER_VERSION}/${KERNEL_RELEASE}/${ARCH}/module/${DRIVER_NAME}.ko" > /dev/null 2>&1; then echo "* Success: ${DRIVER_NAME} module found and loaded in dkms" exit 0 @@ -195,7 +195,7 @@ load_kernel_module_download() { echo "* Trying to download a prebuilt ${DRIVER_NAME} module from ${URL}" if curl -L --create-dirs "${FALCO_DRIVER_CURL_OPTIONS}" -o "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" "${URL}"; then echo "* Download succeeded" - chcon -t modules_object_t "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" > /dev/null 2>&1 + chcon -t modules_object_t "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" > /dev/null 2>&1 || true insmod "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" && echo "* Success: ${DRIVER_NAME} module found and inserted" exit $? else