From: Mimi Zohar <zohar@linux•vnet.ibm.com>
To: Randy Dunlap <randy.dunlap@oracle•com>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
Stephen Rothwell <sfr@canb•auug.org.au>,
safford@watson•ibm.com, serue@linux•vnet.ibm.com,
sailer@watson•ibm.com, zohar@us•ibm.com
Subject: Re: linux-next: Tree for July 31 (IMA build error)
Date: Fri, 01 Aug 2008 13:33:00 -0400 [thread overview]
Message-ID: <1217611980.4000.10.camel@new-host-2> (raw)
Randy Dunlap <randy.dunlap@oracle•com> wrote on 08/01/2008 01:34:14 AM:
> security/integrity/ima:
>
> linux-next-20080731/security/integrity/ima/ima_policy.c:81: error: implicit
> declaration of function 'security_audit_rule_match'
> linux-next-20080731/security/integrity/ima/ima_policy.c:206: error: implicit
> declaration of function 'security_audit_rule_init'
> make[4]: *** [security/integrity/ima/ima_policy.o] Error 1
- Update security/integrity/ima/Kconfig for LSM based policy rules
to select CONFIG_AUDIT.
- Add dummy security_filter_rule_init/match routines for when
CONFIG_AUDIT is not configured.
Signed-off-by: Mimi Zohar <zohar@us•ibm.com>
Index: security-testing-2.6/security/integrity/ima/Kconfig
===================================================================
--- security-testing-2.6.orig/security/integrity/ima/Kconfig
+++ security-testing-2.6/security/integrity/ima/Kconfig
@@ -39,3 +39,11 @@ config IMA_BASE_HOOKS
default n
help
Enable this option to allow the LSM module to enforce integrity.
+
+config IMA_LSM_BASED_RULES
+ bool "Enable LSM based measurement policy rules(requires audit)"
+ depends on IMA
+ select AUDIT
+ default y
+ help
+ Disabling this option will not enforce LSM based policy rules.
Index: security-testing-2.6/security/integrity/ima/ima.h
===================================================================
--- security-testing-2.6.orig/security/integrity/ima/ima.h
+++ security-testing-2.6/security/integrity/ima/ima.h
@@ -145,4 +145,25 @@ struct ima_iint_cache {
u8 digest[IMA_DIGEST_SIZE];
struct mutex mutex;
};
+
+/* LSM based policy rules require audit */
+#ifdef CONFIG_AUDIT
+
+#define security_filter_rule_init security_audit_rule_init
+#define security_filter_rule_match security_audit_rule_match
+
+#else
+
+static inline int security_filter_rule_init(u32 field, u32 op, char *rulestr,
+ void **lsmrule)
+{
+ return -EINVAL;
+}
+
+static inline int security_filter_rule_match(u32 secid, u32 field, u32 op,
+ void *lsmrule, struct audit_context *actx)
+{
+ return -EINVAL;
+}
+#endif
#endif
Index: security-testing-2.6/security/integrity/ima/ima_policy.c
===================================================================
--- security-testing-2.6.orig/security/integrity/ima/ima_policy.c
+++ security-testing-2.6/security/integrity/ima/ima_policy.c
@@ -20,9 +20,6 @@
#include "ima.h"
-#define security_filter_rule_init security_audit_rule_init
-#define security_filter_rule_match security_audit_rule_match
-
struct ima_measure_rule_entry {
struct list_head list;
int action;
next reply other threads:[~2008-08-01 17:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-01 17:33 Mimi Zohar [this message]
2008-08-01 18:04 ` linux-next: Tree for July 31 (IMA build error) Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2008-07-31 7:58 linux-next: Tree for July 31 Stephen Rothwell
2008-08-01 5:34 ` linux-next: Tree for July 31 (IMA build error) Randy Dunlap
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=1217611980.4000.10.camel@new-host-2 \
--to=zohar@linux$(echo .)vnet.ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=randy.dunlap@oracle$(echo .)com \
--cc=safford@watson$(echo .)ibm.com \
--cc=sailer@watson$(echo .)ibm.com \
--cc=serue@linux$(echo .)vnet.ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=zohar@us$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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