diff options
| author | Kees Cook <keescook@chromium.org> | 2016-05-17 10:45:52 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-17 12:10:30 +0200 |
| commit | b937190c40de0f6f07f592042e3097b16c6b0130 (patch) | |
| tree | 3c30684e605efa39d85d69b88ae4af3df7ce6d9c /security/loadpin/loadpin.c | |
| parent | Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux in... (diff) | |
| download | linux-b937190c40de0f6f07f592042e3097b16c6b0130.tar.xz linux-b937190c40de0f6f07f592042e3097b16c6b0130.zip | |
LSM: LoadPin: provide enablement CONFIG
Instead of being enabled by default when SECURITY_LOADPIN is selected,
provide an additional (default off) config to determine the boot time
behavior. As before, the "loadpin.enabled=0/1" kernel parameter remains
available.
Suggested-by: James Morris <jmorris@namei.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to '')
| -rw-r--r-- | security/loadpin/loadpin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/loadpin/loadpin.c b/security/loadpin/loadpin.c index e4debae3c4d6..89a46f10b8a7 100644 --- a/security/loadpin/loadpin.c +++ b/security/loadpin/loadpin.c @@ -45,7 +45,7 @@ static void report_load(const char *origin, struct file *file, char *operation) kfree(pathname); } -static int enabled = 1; +static int enabled = IS_ENABLED(CONFIG_SECURITY_LOADPIN_ENABLED); static struct super_block *pinned_root; static DEFINE_SPINLOCK(pinned_root_spinlock); |