From: James Morris <jmorris@namei.org>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Mimi Zohar <zohar@linux.ibm.com>,
Randy Dunlap <rdunlap@infradead.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-integrity@vger.kernel.org
Subject: Re: linux-next: Tree for Dec 14 (security/integrity/ima/)
Date: Fri, 21 Dec 2018 05:00:43 +1100 (AEDT) [thread overview]
Message-ID: <alpine.LRH.2.21.1812210500010.29474@namei.org> (raw)
In-Reply-To: <20181214222802.GP11670@windriver.com>
On Fri, 14 Dec 2018, Paul Gortmaker wrote:
> >From 31081a8b46e84d64e2fbda8d0d82ba26d56cc468 Mon Sep 17 00:00:00 2001
> From: Paul Gortmaker <paul.gortmaker@windriver.com>
> 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 <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>
>
> 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
<jmorris@namei.org>
next prev parent reply other threads:[~2018-12-20 18:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 7:18 linux-next: Tree for Dec 14 Stephen Rothwell
2018-12-14 16:25 ` linux-next: Tree for Dec 14 (security/integrity/ima/) Randy Dunlap
2018-12-14 19:19 ` Mimi Zohar
2018-12-14 20:26 ` Paul Gortmaker
2018-12-14 22:28 ` Paul Gortmaker
2018-12-20 18:00 ` James Morris [this message]
2018-12-15 15:51 ` linux-next: Tree for Dec 14 Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LRH.2.21.1812210500010.29474@namei.org \
--to=jmorris@namei.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).