* [PATCH 1/2] ima: "remove enforce checking duplication" merge fix
@ 2013-02-24 15:26 Mimi Zohar
2013-02-25 3:00 ` James Morris
0 siblings, 1 reply; 2+ messages in thread
From: Mimi Zohar @ 2013-02-24 15:26 UTC (permalink / raw)
To: linux-security-module; +Cc: James Morris, Linus Torvalds, linux-kernel
Commit "750943a ima: remove enforce checking duplication" combined
the 'in IMA policy' and 'enforcing file integrity' checks. For
the non-file, kernel module verification, a specific check for
'enforcing file integrity' was not added. This patch adds the
check.
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
---
security/integrity/ima/ima_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 5127afc..5b14a09 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -284,7 +284,8 @@ int ima_module_check(struct file *file)
{
if (!file) {
#ifndef CONFIG_MODULE_SIG_FORCE
- if (ima_appraise & IMA_APPRAISE_MODULES)
+ if ((ima_appraise & IMA_APPRAISE_MODULES) &&
+ (ima_appraise & IMA_APPRAISE_ENFORCE))
return -EACCES; /* INTEGRITY_UNKNOWN */
#endif
return 0; /* We rely on module signature checking */
--
1.8.1.rc3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] ima: "remove enforce checking duplication" merge fix
2013-02-24 15:26 [PATCH 1/2] ima: "remove enforce checking duplication" merge fix Mimi Zohar
@ 2013-02-25 3:00 ` James Morris
0 siblings, 0 replies; 2+ messages in thread
From: James Morris @ 2013-02-25 3:00 UTC (permalink / raw)
To: Mimi Zohar; +Cc: linux-security-module, Linus Torvalds, linux-kernel
On Sun, 24 Feb 2013, Mimi Zohar wrote:
> Commit "750943a ima: remove enforce checking duplication" combined
> the 'in IMA policy' and 'enforcing file integrity' checks. For
> the non-file, kernel module verification, a specific check for
> 'enforcing file integrity' was not added. This patch adds the
> check.
>
Where did you post 2/2 ?
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-25 3:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-24 15:26 [PATCH 1/2] ima: "remove enforce checking duplication" merge fix Mimi Zohar
2013-02-25 3:00 ` James Morris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®