Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e950598d authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

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: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Tested-by: default avatarThomas Meyer <thomas@m3y3r.de>
Tested-by: default avatarDavid <Safford&lt;safford@watson.ibm.com>
Cc: Stable Kernel <stable@kernel.org>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 999b4f0a

security/integrity/ima/ima.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

security/integrity/ima/ima_iint.c

+3 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ 


RADIX_TREE(ima_iint_store, GFP_ATOMIC);

DEFINE_SPINLOCK(ima_iint_lock);



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 gets a reference to the iint. Caller must
@@ -141,6 +142,7 @@ static int __init ima_iintcache_init(void) 
	iint_cache =

	    kmem_cache_create("iint_cache", sizeof(struct ima_iint_cache), 0,

			      SLAB_PANIC, init_once);

	iint_initialized = 1;

	return 0;

}

security_initcall(ima_iintcache_init);

security/integrity/ima/ima_main.c

+5 −3
Original line number Diff line number Diff line
@@ -148,12 +148,14 @@ void ima_counts_get(struct file *file) 
	struct ima_iint_cache *iint;

	int rc;



	if (!ima_initialized || !S_ISREG(inode->i_mode))

	if (!iint_initialized || !S_ISREG(inode->i_mode))

		return;

	iint = ima_iint_find_get(inode);

	if (!iint)

		return;

	mutex_lock(&iint->mutex);

	if (!ima_initialized)

		goto out;

	rc = ima_must_measure(iint, inode, MAY_READ, FILE_CHECK);

	if (rc < 0)

		goto out;
@@ -213,7 +215,7 @@ void ima_file_free(struct file *file) 
	struct inode *inode = file->f_dentry->d_inode;

	struct ima_iint_cache *iint;



	if (!ima_initialized || !S_ISREG(inode->i_mode))

	if (!iint_initialized || !S_ISREG(inode->i_mode))

		return;

	iint = ima_iint_find_get(inode);

	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 ima_iint_cache *iint;

	int rc;

	int rc = 0;



	if (!ima_initialized || !S_ISREG(inode->i_mode))

		return 0;