diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2010-08-31 09:38:51 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-09-08 09:51:41 +1000 |
| commit | e950598d43dce8d97e7d5270808393425d1e5cbd (patch) | |
| tree | 916c8a6c5dc63cd3486aa7200964269ea31b4d42 /security/integrity/ima/ima.h | |
| parent | 999b4f0aa2314b76857775334cb94bafa053db64 (diff) | |
| download | kernel_samsung_smdk4412-e950598d43dce8d97e7d5270808393425d1e5cbd.zip kernel_samsung_smdk4412-e950598d43dce8d97e7d5270808393425d1e5cbd.tar.gz kernel_samsung_smdk4412-e950598d43dce8d97e7d5270808393425d1e5cbd.tar.bz2 | |
ima: always maintain counters
commit 8262bb85da allocated the inode integrity struct (iint) before any
inodes were created. Only after IMA was initialized in late_initcall were
the counters updated. This patch updates the counters, whether or not IMA
has been initialized, to resolve 'imbalance' messages.
This patch fixes the bug as reported in bugzilla: 15673. When the i915
is builtin, the ring_buffer is initialized before IMA, causing the
imbalance message on suspend.
Reported-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Tested-by: Thomas Meyer <thomas@m3y3r.de>
Tested-by: David Safford<safford@watson.ibm.com>
Cc: Stable Kernel <stable@kernel.org>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity/ima/ima.h')
| -rw-r--r-- | security/integrity/ima/ima.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 16d100d..3fbcd1d 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -35,6 +35,7 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 }; #define IMA_MEASURE_HTABLE_SIZE (1 << IMA_HASH_BITS) /* set during initialization */ +extern int iint_initialized; extern int ima_initialized; extern int ima_used_chip; extern char *ima_hash; |