diff options
| author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-09-24 10:05:10 +0200 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-10-07 20:32:52 +0200 |
| commit | 0f34a0060aebf202010b3f8fef348653a2df2346 (patch) | |
| tree | 5cb7a5aabb05827889989c779ac8a2242cd4a0df /security/integrity/integrity.h | |
| parent | integrity: do zero padding of the key id (diff) | |
| download | linux-0f34a0060aebf202010b3f8fef348653a2df2346.tar.xz linux-0f34a0060aebf202010b3f8fef348653a2df2346.zip | |
ima: check ima_policy_flag in the ima_file_free() hook
This patch completes the switching to the 'ima_policy_flag' variable
in the checks at the beginning of IMA functions, starting with the
commit a756024e.
Checking 'iint_initialized' is completely unnecessary, because
S_IMA flag is unset if iint was not allocated. At the same time
the integrity cache is allocated with SLAB_PANIC and the kernel will
panic if the allocation fails during kernel initialization. So on
a running system iint_initialized is always true and can be removed.
Changes in v3:
* not limiting test to IMA_APPRAISE (spotted by Roberto Sassu)
Changes in v2:
* 'iint_initialized' removal patch merged to this patch (requested
by Mimi)
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Acked-by: Roberto Sassu <roberto.sassu@polito.it>
Diffstat (limited to '')
| -rw-r--r-- | security/integrity/integrity.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index c0379d13dbe1..883a5fc75449 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h @@ -169,6 +169,3 @@ static inline void integrity_audit_msg(int audit_msgno, struct inode *inode, { } #endif - -/* set during initialization */ -extern int iint_initialized; |