Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ima: always maintain counters

Browse source 
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>
This commit is contained in:
Mimi Zohar 2010-08-31 09:38:51 -04:00 committed by James Morris
parent 999b4f0aa2
commit e950598d43
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
security/integrity/ima/ima.h
View file

@ -35,6 +35,7 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
#define IMA_MEASURE_HTABLE_SIZE (1 << IMA_HASH_BITS) #define IMA_MEASURE_HTABLE_SIZE (1 << IMA_HASH_BITS)
/* set during initialization */ /* set during initialization */
extern int iint_initialized;
extern int ima_initialized; extern int ima_initialized;
extern int ima_used_chip; extern int ima_used_chip;
extern char *ima_hash; extern char *ima_hash;

4
security/integrity/ima/ima_iint.c
View file

@ -22,9 +22,10 @@
RADIX_TREE(ima_iint_store, GFP_ATOMIC); RADIX_TREE(ima_iint_store, GFP_ATOMIC);
DEFINE_SPINLOCK(ima_iint_lock); DEFINE_SPINLOCK(ima_iint_lock);
static struct kmem_cache *iint_cache __read_mostly; static struct kmem_cache *iint_cache __read_mostly;
int iint_initialized = 0;
/* ima_iint_find_get - return the iint associated with an inode /* ima_iint_find_get - return the iint associated with an inode
* *
* ima_iint_find_get gets a reference to the iint. Caller must * ima_iint_find_get gets a reference to the iint. Caller must
@ -141,6 +142,7 @@ static int __init ima_iintcache_init(void)
iint_cache = iint_cache =
kmem_cache_create("iint_cache", sizeof(struct ima_iint_cache), 0, kmem_cache_create("iint_cache", sizeof(struct ima_iint_cache), 0,
SLAB_PANIC, init_once); SLAB_PANIC, init_once);
iint_initialized = 1;
return 0; return 0;
} }
security_initcall(ima_iintcache_init); security_initcall(ima_iintcache_init);

8
security/integrity/ima/ima_main.c
View file

@ -148,12 +148,14 @@ void ima_counts_get(struct file *file)
struct ima_iint_cache *iint; struct ima_iint_cache *iint;
int rc; int rc;
if (!ima_initialized || !S_ISREG(inode->i_mode)) if (!iint_initialized || !S_ISREG(inode->i_mode))
return; return;
iint = ima_iint_find_get(inode); iint = ima_iint_find_get(inode);
if (!iint) if (!iint)
return; return;
mutex_lock(&iint->mutex); mutex_lock(&iint->mutex);
if (!ima_initialized)
goto out;
rc = ima_must_measure(iint, inode, MAY_READ, FILE_CHECK); rc = ima_must_measure(iint, inode, MAY_READ, FILE_CHECK);
if (rc < 0) if (rc < 0)
goto out; goto out;
@ -213,7 +215,7 @@ void ima_file_free(struct file *file)
struct inode *inode = file->f_dentry->d_inode; struct inode *inode = file->f_dentry->d_inode;
struct ima_iint_cache *iint; struct ima_iint_cache *iint;
if (!ima_initialized || !S_ISREG(inode->i_mode)) if (!iint_initialized || !S_ISREG(inode->i_mode))
return; return;
iint = ima_iint_find_get(inode); iint = ima_iint_find_get(inode);
if (!iint) if (!iint)
@ -230,7 +232,7 @@ static int process_measurement(struct file *file, const unsigned char *filename,
{ {
struct inode *inode = file->f_dentry->d_inode; struct inode *inode = file->f_dentry->d_inode;
struct ima_iint_cache *iint; struct ima_iint_cache *iint;
int rc; int rc = 0;
if (!ima_initialized || !S_ISREG(inode->i_mode)) if (!ima_initialized || !S_ISREG(inode->i_mode))
return 0; return 0;