aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/firmware_loader/fallback.c
diff options
context:
space:
mode:
authorSven Van Asbroeck <[email protected]>2019-06-17 18:23:54 +0000
committerGreg Kroah-Hartman <[email protected]>2019-06-18 07:10:02 +0000
commit2472d64af2d3561954e2f05365a67692bb852f2a (patch)
tree970ea3d44d0f259e58f629d49b419c91a365139f /drivers/base/firmware_loader/fallback.c
parentARM: omap1: remove unused variable (diff)
downloadkernel-2472d64af2d3561954e2f05365a67692bb852f2a.tar.gz
kernel-2472d64af2d3561954e2f05365a67692bb852f2a.zip
firmware: improve LSM/IMA security behaviour
The firmware loader queries if LSM/IMA permits it to load firmware via the sysfs fallback. Unfortunately, the code does the opposite: it expressly permits sysfs fw loading if security_kernel_load_data( LOADING_FIRMWARE) returns -EACCES. This happens because a zero-on-success return value is cast to a bool that's true on success. Fix the return value handling so we get the correct behaviour. Fixes: 6e852651f28e ("firmware: add call to LSM hook before firmware sysfs fallback") Cc: Stable <[email protected]> Cc: Mimi Zohar <[email protected]> Cc: Kees Cook <[email protected]> To: Luis Chamberlain <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: "Rafael J. Wysocki" <[email protected]> Cc: [email protected] Signed-off-by: Sven Van Asbroeck <[email protected]> Reviewed-by: Mimi Zohar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/base/firmware_loader/fallback.c')
-rw-r--r--drivers/base/firmware_loader/fallback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c
index b5cd96fd0e77..29becea1910d 100644
--- a/drivers/base/firmware_loader/fallback.c
+++ b/drivers/base/firmware_loader/fallback.c
@@ -659,7 +659,7 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_flags)
/* Also permit LSMs and IMA to fail firmware sysfs fallback */
ret = security_kernel_load_data(LOADING_FIRMWARE);
if (ret < 0)
- return ret;
+ return false;
return fw_force_sysfs_fallback(opt_flags);
}