diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-12-14 22:48:07 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-12-20 18:59:12 +0100 |
| commit | b49d564344f773d8afee982153c8493e5f2eaf38 (patch) | |
| tree | aa8decdd23d6c07ac1c58fd854a3173388b5f138 /security/integrity/ima/ima_main.c | |
| parent | Merge tag 'v4.20-rc7' into next-general (diff) | |
| download | linux-b49d564344f773d8afee982153c8493e5f2eaf38.tar.xz linux-b49d564344f773d8afee982153c8493e5f2eaf38.zip | |
security: integrity: partial revert of make ima_main explicitly non-modular
In commit 4f83d5ea643a ("security: integrity: make ima_main explicitly
non-modular") I'd removed <linux/module.h> after assuming that the
function is_module_sig_enforced() was an LSM function and not a core
kernel module function.
Unfortunately the typical .config selections used in build testing
provide an implicit <linux/module.h> presence, and so normal/typical
build testing did not immediately reveal my incorrect assumption.
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc: James Morris <james.l.morris@oracle.com>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: linux-ima-devel@lists.sourceforge.net
Cc: linux-security-module@vger.kernel.org
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'security/integrity/ima/ima_main.c')
| -rw-r--r-- | security/integrity/ima/ima_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index adaf96932237..616a88f95b92 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -21,7 +21,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include <linux/init.h> +#include <linux/module.h> #include <linux/file.h> #include <linux/binfmts.h> #include <linux/mount.h> |