diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2018-07-13 14:05:59 -0400 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-07-16 12:31:57 -0700 |
| commit | 6e852651f28eee851069c7d40989281fae4bf9d2 (patch) | |
| tree | 2e3c159316960aea87c20d76c5d22a7cb991e966 /drivers/base | |
| parent | 16c267aac86b463b1fcccd43c89f4c8e5c5c86fa (diff) | |
| download | linux-rpi-6e852651f28eee851069c7d40989281fae4bf9d2.tar.gz linux-rpi-6e852651f28eee851069c7d40989281fae4bf9d2.tar.bz2 linux-rpi-6e852651f28eee851069c7d40989281fae4bf9d2.zip | |
firmware: add call to LSM hook before firmware sysfs fallback
Add an LSM hook prior to allowing firmware sysfs fallback loading.
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/firmware_loader/fallback.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 7f732744f0d3..202324291542 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(enum fw_opt opt_flags) static bool fw_run_sysfs_fallback(enum fw_opt 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(enum fw_opt opt_flags) if ((opt_flags & FW_OPT_NOFALLBACK)) return false; + /* Also permit LSMs and IMA to fail firmware sysfs fallback */ + ret = security_kernel_load_data(LOADING_FIRMWARE); + if (ret < 0) + return ret; + return fw_force_sysfs_fallback(opt_flags); } |