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

Commit 5311034d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  IMA: iint put in ima_counts_get and put
parents 533995ed 53a7197a

security/integrity/ima/ima_main.c

+4 −0
Original line number Diff line number Diff line
@@ -262,6 +262,8 @@ void ima_counts_put(struct path *path, int mask) 
	else if (mask & (MAY_READ | MAY_EXEC))

		iint->readcount--;

	mutex_unlock(&iint->mutex);



	kref_put(&iint->refcount, iint_free);

}



/*
@@ -291,6 +293,8 @@ void ima_counts_get(struct file *file) 
	if (file->f_mode & FMODE_WRITE)

		iint->writecount++;

	mutex_unlock(&iint->mutex);



	kref_put(&iint->refcount, iint_free);

}

EXPORT_SYMBOL_GPL(ima_counts_get);