diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-03-09 20:13:22 +0100 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-07-18 18:29:38 +0200 |
| commit | f381c272224f5f158f5cff64f8f3481fa0eee8b3 (patch) | |
| tree | a003dc4c6635c9d2fa90f31577ba5e7ea7bc71b1 /security/security.c | |
| parent | security: new security_inode_init_security API adds function callback (diff) | |
| download | linux-f381c272224f5f158f5cff64f8f3481fa0eee8b3.tar.xz linux-f381c272224f5f158f5cff64f8f3481fa0eee8b3.zip | |
integrity: move ima inode integrity data management
Move the inode integrity data(iint) management up to the integrity directory
in order to share the iint among the different integrity models.
Changelog:
- don't define MAX_DIGEST_SIZE
- rename several globally visible 'ima_' prefixed functions, structs,
locks, etc to 'integrity_'
- replace '20' with SHA1_DIGEST_SIZE
- reflect location change in appropriate Kconfig and Makefiles
- remove unnecessary initialization of iint_initialized to 0
- rebased on current ima_iint.c
- define integrity_iint_store/lock as static
There should be no other functional changes.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c index 3464d58a5766..947fdcfbc83e 100644 --- a/security/security.c +++ b/security/security.c @@ -16,6 +16,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/security.h> +#include <linux/integrity.h> #include <linux/ima.h> #define MAX_LSM_XATTR 1 @@ -336,7 +337,7 @@ int security_inode_alloc(struct inode *inode) void security_inode_free(struct inode *inode) { - ima_inode_free(inode); + integrity_inode_free(inode); security_ops->inode_free_security(inode); } |