[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1525182503-13849-2-git-send-email-zohar@linux.vnet.ibm.com>
Date: Tue, 1 May 2018 09:48:18 -0400
From: Mimi Zohar <zohar@...ux.vnet.ibm.com>
To: linux-integrity@...r.kernel.org
Cc: Hans de Goede <hdegoede@...hat.com>,
Ard Biesheuvel <ard.biesheuvel@...aro.org>,
Peter Jones <pjones@...hat.com>,
Mimi Zohar <zohar@...ux.vnet.ibm.com>,
linux-security-module@...r.kernel.org,
linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com>,
"Luis R . Rodriguez" <mcgrof@...nel.org>,
"Luis R . Rodriguez" <mcgrof@...e.com>,
Kees Cook <keescook@...omium.org>,
Matthew Garrett <mjg59@...gle.com>
Subject: [PATCH 1/6] firmware: permit LSMs and IMA to fail firmware sysfs fallback loading
Add an LSM hook prior to allowing firmware sysfs fallback loading.
Signed-off-by: Mimi Zohar <zohar@...ux.vnet.ibm.com>
Cc: Luis R. Rodriguez <mcgrof@...e.com>
Cc: David Howells <dhowells@...hat.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Matthew Garrett <mjg59@...gle.com>
---
drivers/base/firmware_loader/fallback.c | 7 +++++++
include/linux/fs.h | 1 +
2 files changed, 8 insertions(+)
diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c
index 31b5015b59fe..23d2af30474e 100644
--- a/drivers/base/firmware_loader/fallback.c
+++ b/drivers/base/firmware_loader/fallback.c
@@ -651,6 +651,8 @@ static bool fw_force_sysfs_fallback(unsigned int opt_flags)
static bool fw_run_sysfs_fallback(unsigned int opt_flags)
{
+ int ret;
+
if (fw_fallback_config.ignore_sysfs_fallback) {
pr_info_once("Ignoring firmware sysfs fallback due to sysctl knob\n");
return false;
@@ -659,6 +661,11 @@ static bool fw_run_sysfs_fallback(unsigned int opt_flags)
if ((opt_flags & FW_OPT_NOFALLBACK))
return false;
+ /* Also permit LSMs and IMA to fail firmware sysfs fallback */
+ ret = security_kernel_read_file(NULL, READING_FIRMWARE_FALLBACK);
+ if (ret < 0)
+ return ret;
+
return fw_force_sysfs_fallback(opt_flags);
}
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 760d8da1b6c7..dc16a73c3d38 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2810,6 +2810,7 @@ extern int do_pipe_flags(int *, int);
id(UNKNOWN, unknown) \
id(FIRMWARE, firmware) \
id(FIRMWARE_PREALLOC_BUFFER, firmware) \
+ id(FIRMWARE_FALLBACK, firmware) \
id(MODULE, kernel-module) \
id(KEXEC_IMAGE, kexec-image) \
id(KEXEC_INITRAMFS, kexec-initramfs) \
--
2.7.5
Powered by blists - more mailing lists