On Fri, 14 Dec 2018, Paul Gortmaker wrote: > >From 31081a8b46e84d64e2fbda8d0d82ba26d56cc468 Mon Sep 17 00:00:00 2001 > From: Paul Gortmaker <[email protected]> > Date: Fri, 14 Dec 2018 16:48:07 -0500 > Subject: [PATCH] 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 <[email protected]> > Cc: Dmitry Kasatkin <[email protected]> > Cc: James Morris <[email protected]> > Cc: "Serge E. Hallyn" <[email protected]> > Cc: [email protected] > Cc: [email protected] > Reported-by: Randy Dunlap <[email protected]> > Signed-off-by: Paul Gortmaker <[email protected]> > > 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> >
Applied to git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general and next-testing -- James Morris <[email protected]>
